discomfitor pushed a commit to branch master.

commit d0ddc48425606d9fba1f3bfb5cc649bb24a919d9
Author: Mike Blumenkrantz <[email protected]>
Date:   Tue Sep 3 14:09:38 2013 +0100

    null check here in case someone decides to try crashing their compositor 
for fun?
---
 src/modules/teamwork/e_mod_tw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index a78fc3d..7081e5a 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -784,6 +784,7 @@ tw_show_helper(Evas_Object *o, int w, int h)
 {
    int px, py, pw, ph;
    double ratio = tw_config->popup_size / 100.;
+   E_Border *bd = NULL;
 
    E_FREE_FUNC(tw_mod->pop, e_object_del);
    tw_mod->sticky = 0;
@@ -812,9 +813,8 @@ tw_show_helper(Evas_Object *o, int w, int h)
         if (py + ph > tw_mod->pop->zone->h)
           py = tw_mod->pop->zone->h - ph;
      }
-   else if (tw_win)
+   else if (tw_win && ((bd = e_border_find_by_client_window(tw_win))))
      {
-        E_Border *bd = e_border_find_by_client_window(tw_win);
         int x, y;
 
         x = bd->x + bd->client_inset.l + last_coords.x;

-- 

------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58040911&iu=/4140/ostg.clktrk

Reply via email to