Imported Upstream version 20090110

[ion3.git] / ioncore / framedpholder.c

diff --git a/ioncore/framedpholder.c b/ioncore/framedpholder.c
index 0a198087709a0b913f4ce5253028feca52b6491a..60c6291ba6c894a58520427b742c2778993cdab1 100644 (file)
--- a/ioncore/framedpholder.c
+++ b/ioncore/framedpholder.c
@@ -1,7 +1,7 @@
 /*
  * ion/ioncore/framedpholder.c
  *
- * Copyright (c) Tuomo Valkonen 2005-2008. 
+ * Copyright (c) Tuomo Valkonen 2005-2009. 
  *
  * See the included file LICENSE for details.
  */
@@ -202,7 +202,9 @@ WRegion *framedpholder_do_attach(WFramedPHolder *ph, int flags,
         watch_setup(&ph->frame_watch, (Obj*)frame, NULL);
     }
     
-    return ap.reg_ret;
+    return (flags&PHOLDER_ATTACH_RETURN_CREATEROOT
+            ? (WRegion*)frame
+            : ap.reg_ret);
 }