X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=ioncore%2Fgrouppholder.c;h=39ff6fc519b34372d61f1a98c52842607a826818;hp=afd8ac675f54808d674b3b2f59bf9de22bca7c51;hb=20080103;hpb=f869221ce49f0fb7cca48eee28daff8684305963 diff --git a/ioncore/grouppholder.c b/ioncore/grouppholder.c index afd8ac6..39ff6fc 100644 --- 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. */ @@ -274,18 +274,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)); }