aboutsummaryrefslogtreecommitdiff
path: root/src/FbCommands.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-05-04 17:13:50 (GMT)
committermarkt <markt>2007-05-04 17:13:50 (GMT)
commitdb2904e1445bfe09c7ea55e2d67f4e51aeca292f (patch)
treed58b0fd966562b083ef8e50bf48c9cf936b2ddfb /src/FbCommands.cc
parent5eb658a51fbe8fdb4efdc9379f1bc5bffe86931c (diff)
downloadfluxbox-db2904e1445bfe09c7ea55e2d67f4e51aeca292f.zip
fluxbox-db2904e1445bfe09c7ea55e2d67f4e51aeca292f.tar.bz2
fix infinite loop caused by deiconify command
Diffstat (limited to 'src/FbCommands.cc')
-rw-r--r--src/FbCommands.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/FbCommands.cc b/src/FbCommands.cc
index 060f4d3..afa7984 100644
--- a/src/FbCommands.cc
+++ b/src/FbCommands.cc
@@ -394,8 +394,11 @@ void DeiconifyCmd::execute() {
394 if (screen == 0) 394 if (screen == 0)
395 return; 395 return;
396 396
397 BScreen::Icons::reverse_iterator it= screen->iconList().rbegin(); 397 // we need to make a copy of the list of icons, or else our iterator can
398 BScreen::Icons::reverse_iterator itend= screen->iconList().rend(); 398 // become invalid
399 BScreen::Icons icon_list = screen->iconList();
400 BScreen::Icons::iterator it = icon_list.begin();
401 BScreen::Icons::iterator itend= icon_list.end();
399 unsigned int workspace_num= screen->currentWorkspaceID(); 402 unsigned int workspace_num= screen->currentWorkspaceID();
400 unsigned int old_workspace_num; 403 unsigned int old_workspace_num;
401 404