Imported Upstream version 20090110

[ion3.git] / ioncore / group-ws.c

diff --git a/ioncore/group-ws.c b/ioncore/group-ws.c
index c12d8ec905242c2f2af097fe0b25c71d5c1de801..d7b74473e37cff9be5406e77d96dcb17da185d89 100644 (file)
--- a/ioncore/group-ws.c
+++ b/ioncore/group-ws.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/group-ws.c
  *
- * Copyright (c) Tuomo Valkonen 1999-2007. 
+ * Copyright (c) Tuomo Valkonen 1999-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -285,10 +285,8 @@ static bool group_empty_for_bottom_stdisp(WGroup *ws)
 static WRegion *groupws_managed_disposeroot(WGroupWS *ws, WRegion *reg)
 {
     if(group_bottom(&ws->grp)==reg){
-        if(group_empty_for_bottom_stdisp(&ws->grp)){
-            WRegion *tmpr=region_disposeroot((WRegion*)ws);
-            return (tmpr!=NULL ? tmpr : reg);
-        }
+        if(group_empty_for_bottom_stdisp(&ws->grp))
+            return region_disposeroot((WRegion*)ws);
     }
     
     return reg;