Add 20080411-1.

[ion3.git] / ioncore / grouppholder.c

diff --git a/ioncore/grouppholder.c b/ioncore/grouppholder.c
index afd8ac675f54808d674b3b2f59bf9de22bca7c51..cdd2dce546b35b144132d83adc1340f63750e7ba 100644 (file)
--- a/ioncore/grouppholder.c
+++ b/ioncore/grouppholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/grouppholder.c
  *
- * Copyright (c) Tuomo Valkonen 2005-2007. 
+ * Copyright (c) Tuomo Valkonen 2005-2008. 
  *
  * See the included file LICENSE for details.
  */
@@ -72,17 +72,21 @@ void grouppholder_do_unlink(WGroupPHolder *ph)
     
     if(group!=NULL){
         UNLINK_ITEM(group->phs, ph, next, prev);
-    }else{
+    }else if(ph->prev!=NULL){
         WGroupPHolder *next=ph->next;
         
-        if(ph->prev!=NULL)
-            ph->prev->next=next;
+        ph->prev->next=next;
 
         if(next==NULL){
             next=get_head(ph);
             assert(next->prev==ph);
         }
         next->prev=ph->prev;
+    }else{
+        /* ph should not be on a list, if prev pointer is NULL (whereas
+         * next alone can be NULL in our semi-doubly-linked lists).
+         */
+        assert(ph->next==NULL);
     }
     
     ph->group=NULL;
@@ -274,18 +278,21 @@ WRegion *grouppholder_do_attach(WGroupPHolder *ph, int flags,
 
 bool grouppholder_do_goto(WGroupPHolder *ph)
 {
-    WGroup *ws=ph->group;
-    
-    if(ws!=NULL)
-        return region_goto((WRegion*)ws);
-    
-    return FALSE;
+    return (ph->group!=NULL
+            ? region_goto((WRegion*)ph->group)
+            : (ph->recreate_pholder!=NULL
+               ? pholder_do_goto(ph->recreate_pholder)
+               : FALSE));
 }
 
 
 WRegion *grouppholder_do_target(WGroupPHolder *ph)
 {
-    return (WRegion*)ph->group;
+    return (ph->group!=NULL
+            ? (WRegion*)ph->group
+            : (ph->recreate_pholder!=NULL
+               ? pholder_do_target(ph->recreate_pholder)
+               : NULL));
 }