aboutsummaryrefslogtreecommitdiff
path: root/src/IconButton.cc
diff options
context:
space:
mode:
authormathias <mathias>2005-01-05 01:56:19 (GMT)
committermathias <mathias>2005-01-05 01:56:19 (GMT)
commit0c74e8c9355f6f70d426edaacafd296331aa3523 (patch)
tree95fd218719254ca5c54b44880888443eab5ea453 /src/IconButton.cc
parent1657de3cefd497823fcd3e57316cf32499dbd415 (diff)
downloadfluxbox_pavel-0c74e8c9355f6f70d426edaacafd296331aa3523.zip
fluxbox_pavel-0c74e8c9355f6f70d426edaacafd296331aa3523.tar.bz2
Simon's last changes lead to segfaults when the users specified <Sticky> or
<Workspace> in apps-file. Reason is, that an unmanaged window is not yet assigned to an workspace and thus the returned workspacenumber is -1 ... which leads in combination with getWorkspace(nr) to an invalid workspace (0x0) ... This also fixes the problem with several deiconify-modes of the iconbar, when the iconbar is in icons-only mode (same reason) The other changes in the files are just cosmetic, i throw out the comments about the changes Simon did coz they make sense and are correct imho.
Diffstat (limited to 'src/IconButton.cc')
-rw-r--r--src/IconButton.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/IconButton.cc b/src/IconButton.cc
index 24bdddf..40310e6 100644
--- a/src/IconButton.cc
+++ b/src/IconButton.cc
@@ -81,20 +81,17 @@ public:
81 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); 81 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
82 } else { 82 } else {
83 m_win.screen().changeWorkspaceID(m_win.workspaceNumber()); 83 m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
84 m_win.raiseAndFocus();
85 } 84 }
86 break; 85 break;
87 case IconbarTool::CURRENT: 86 case IconbarTool::CURRENT:
88 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win); 87 m_win.screen().sendToWorkspace(m_win.screen().currentWorkspaceID(), &m_win);
89 m_win.raiseAndFocus();
90 break; 88 break;
91 case IconbarTool::FOLLOW: 89 case IconbarTool::FOLLOW:
92 default: 90 default:
93 m_win.screen().changeWorkspaceID(m_win.workspaceNumber()); 91 m_win.screen().changeWorkspaceID(m_win.workspaceNumber());
94 m_win.raiseAndFocus();
95 break; 92 break;
96 }; 93 };
97 94 m_win.raiseAndFocus();
98 } else 95 } else
99 m_win.iconify(); 96 m_win.iconify();
100 } 97 }