M src/FbCommands.cc → src/FbCommands.cc

@@ -253,10 +253,7 @@ RestartFluxboxCmd::RestartFluxboxCmd(const string &cmd):m_cmd(cmd){
 }
 
 void RestartFluxboxCmd::execute() {
-    if (m_cmd.empty())
-        Fluxbox::instance()->restart();
-    else
-        Fluxbox::instance()->restart(m_cmd.c_str());
+    Fluxbox::instance()->restart(m_cmd.c_str());
 }
 
 REGISTER_COMMAND(reconfigure, FbCommands::ReconfigureFluxboxCmd, void);

M src/WindowState.cc → src/WindowState.cc

@@ -170,6 +170,8 @@ if (base_height > min_height)
         min_height = base_height;
 }
 
+namespace {
+
 void closestPointToAspect(unsigned int &ret_x, unsigned int &ret_y,
                           unsigned int point_x, unsigned int point_y,
                           unsigned int aspect_x, unsigned int aspect_y) {
@@ -187,7 +189,9 @@ 
 unsigned int decreaseToMultiple(unsigned int val, unsigned int inc) {
     return val % inc ? val - (val % inc) : val;
 }
-    
+
+} // end of anonymous namespace
+
 /**
  * Changes width and height to the nearest (lower) value
  * that conforms to it's size hints.

M src/fluxbox.cc → src/fluxbox.cc

@@ -1216,7 +1216,7 @@ shutdown();
 
     m_restarting = true;
 
-    if (prog) {
+    if (prog && *prog != '\0') {
         m_restart_argument = prog;
     }
 }