2 files changed, 15 insertions, 10 deletions

diff --git a/src/Remember.cc b/src/Remember.cc
index d39cd3e..f084677 100644
--- a/src/Remember.cc
+++ b/src/Remember.cc
@@ -169,7 +169,7 @@ FbTk::Menu *createRememberMenu(BScreen &screen) {
 bool handleStartupItem(const string &line, int offset) {
     int next = 0;
     string str;
-    unsigned int screen = 0;
+    unsigned int screen = Fluxbox::instance()->keyScreen()->screenNumber();
 
     // accept some options, for now only "screen=NN"
     // these option are given in parentheses before the command
@@ -206,15 +206,20 @@ bool handleStartupItem(const string &line, int offset) {
     if (next <= 0) {
         cerr<<"Error parsing [startup] at column "<<offset<<" - expecting {command}."<<endl;
         return false;
-    } else {
-        FbCommands::ExecuteCmd *tmp_exec_cmd = new FbCommands::ExecuteCmd(str, screen);
+    }
+
+    // don't run command if fluxbox is restarting
+    if (Fluxbox::instance()->findScreen(screen)->isRestart())
+        // the line was successfully read; we just didn't use it
+        return true;
+
+    FbCommands::ExecuteCmd *tmp_exec_cmd = new FbCommands::ExecuteCmd(str, screen);
 #ifdef DEBUG
-        cerr<<"Executing startup command '"<<str<<"' on screen "<<screen<<endl;
+    cerr<<"Executing startup command '"<<str<<"' on screen "<<screen<<endl;
 #endif // DEBUG
-        tmp_exec_cmd->execute();
-        delete tmp_exec_cmd;
-        return true;
-    }
+    tmp_exec_cmd->execute();
+    delete tmp_exec_cmd;
+    return true;
 };
 
 }; // end anonymous namespace
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 16e27b8..a8290e5 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -404,6 +404,8 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
                              "Error message when no unmanaged screens found - usually means another window manager is running");
     }
 
+    m_keyscreen = m_mousescreen = m_screen_list.front();
+
     // parse apps file after creating screens but before creating windows
 #ifdef REMEMBER
         addAtomHandler(new Remember(), "remember"); // for remembering window attribs
@@ -417,8 +419,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
 
     XAllowEvents(disp, ReplayPointer, CurrentTime);
 
-    m_keyscreen = m_mousescreen = m_screen_list.front();
-
     // setup theme manager to have our style file ready to be scanned
     FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename());