aboutsummaryrefslogtreecommitdiff
path: root/src/Workspace.cc
diff options
context:
space:
mode:
authormathias <mathias>2005-04-27 09:52:30 (GMT)
committermathias <mathias>2005-04-27 09:52:30 (GMT)
commitb97c3db25193c3b549e46910604d27e5ff92baa2 (patch)
treee0625ab80a5dd1f814e58d3d680cc78d9f5cc53b /src/Workspace.cc
parent6df9d6ed54a299c0897cdd2d8aa380dc02b15a41 (diff)
downloadfluxbox_pavel-b97c3db25193c3b549e46910604d27e5ff92baa2.zip
fluxbox_pavel-b97c3db25193c3b549e46910604d27e5ff92baa2.tar.bz2
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.
Diffstat (limited to 'src/Workspace.cc')
-rw-r--r--src/Workspace.cc4
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) {
364 364
365 365
366void Workspace::setName(const std::string &name) { 366void Workspace::setName(const std::string &name) {
367 if (!name.empty()) { 367 if (!name.empty() && name != "") {
368 m_name = name; 368 m_name = name;
369 } else { //if name == 0 then set default name from nls 369 } else { //if name == 0 then set default name from nls
370 _FB_USES_NLS; 370 _FB_USES_NLS;
@@ -375,7 +375,7 @@ void Workspace::setName(const std::string &name) {
375 m_id + 1); //m_id starts at 0 375 m_id + 1); //m_id starts at 0
376 m_name = tname; 376 m_name = tname;
377 } 377 }
378 378
379 screen().updateWorkspaceNamesAtom(); 379 screen().updateWorkspaceNamesAtom();
380 380
381 menu().setLabel(m_name.c_str()); 381 menu().setLabel(m_name.c_str());