3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index bb87563..1d14605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 (Format: Year/Month/Day)
 Changes for 0.9.13
+*05/05/13:
+  * Fix a segfault crash, and a similar potential one (Simon)
+    Remember.cc Gnome.cc
 *05/05/12:
   * Fixed configure.in for iconv for different platforms (Mathias)
   * Fixed setenv/putenv issues on platforms which dont support setenv (Mathias)
diff --git a/src/Gnome.cc b/src/Gnome.cc
index 097a462..9fd1a48 100644
--- a/src/Gnome.cc
+++ b/src/Gnome.cc
@@ -120,7 +120,7 @@ void Gnome::setupFrame(FluxboxWindow &win) {
                                  (unsigned char **) &data) && data) {
         unsigned int workspace_num = *data;
         if (win.workspaceNumber() != workspace_num) 
-            win.screen().reassociateWindow(&win, workspace_num, false);
+            win.setWorkspace(workspace_num);
         XFree (data);
     } else {
         updateWorkspace(win);
diff --git a/src/Remember.cc b/src/Remember.cc
index b15a861..e3d3db0 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -828,8 +828,8 @@ void Remember::setupFrame(FluxboxWindow &win) {
     BScreen &screen = winclient.screen();
 
     if (app->workspace_remember) {
-        // TODO: fix placement to initialise properly
-        screen.reassociateWindow(&win, app->workspace, true);
+        // we use setWorkspace and not reassoc because we're still initialising
+        win.setWorkspace(app->workspace);
         if (app->jumpworkspace_remember)
             screen.changeWorkspaceID(app->workspace);
     }