discomfitor pushed a commit to branch master.

commit a94060e402fd92cf4e30f5141302fbbc963f75d7
Author: Mike Blumenkrantz <[email protected]>
Date:   Thu Apr 18 10:53:54 2013 +0100

    fix move/resize check on borders during deletion to fix crash and pop 
pointer
---
 src/bin/e_border.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/bin/e_border.c b/src/bin/e_border.c
index ebc81b1..e64084a 100644
--- a/src/bin/e_border.c
+++ b/src/bin/e_border.c
@@ -4946,17 +4946,8 @@ _e_border_del(E_Border *bd)
 
    if (bd->fullscreen) bd->desk->fullscreen_borders--;
 
-   if (bd->moving)
-     {
-        if (action_border) e_border_act_move_end(bd, NULL);
-        else _e_border_move_end(bd);
-     }
-
-   else if (bd->resize_mode != E_POINTER_RESIZE_NONE)
-     {
-        if (action_border) e_border_act_resize_end(bd, NULL);
-        else _e_border_resize_end(bd);
-     }
+   if (bd->moving) e_border_act_move_end(bd, NULL);
+   else if (bd->resize_mode != E_POINTER_RESIZE_NONE) 
e_border_act_resize_end(bd, NULL);
 
    if (warp_timer_border == bd)
      {

-- 

------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter

Reply via email to