close #1182770

if someone changed the session.screen0.workspaces:<int> value and fired a
"reload config"/reconfigure-Command fluxbox crashed.

changes:

  - cleaner way of reading in the workspacenames
  - cleaner way of initialize the workspaces in BScreen()
  - on BScreen::reconfigure we add/delete Workspaces to the 
    current screen until init-file and fluxbox are in sync

    -> the user changed the initfile and pressed reload, so
       imho he wants to have the changes in the init-file realized.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 4985c39..8a6bdbb 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -364,7 +364,7 @@ void Workspace::update(FbTk::Subject *subj) {
 
 
 void Workspace::setName(const std::string &name) {
-    if (!name.empty()) {
+    if (!name.empty() && name != "") {
         m_name = name;
     } else { //if name == 0 then set default name from nls
         _FB_USES_NLS;
@@ -375,7 +375,7 @@ void Workspace::setName(const std::string &name) {
                 m_id + 1); //m_id starts at 0
         m_name = tname;
     }
-        
+    
     screen().updateWorkspaceNamesAtom();
         
     menu().setLabel(m_name.c_str());