nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix: do not use anything from the current ClientMenuItem after m_client.focus(), closes #3210493

Browse source 
m_client.focus() might call ~ClientMenuItem(), thus m_client is not available anymore. the crash was triggered by trying to deiconify a client via the clientmenu. this triggers a signal to remove and destroy the current ClientMenuItem.
This commit is contained in:
Mathias Gumz 2011-03-15 09:49:06 +01:00
parent bb2ce5df8a
commit a53017cc3b
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ClientMenu.cc
View file

@ -52,15 +52,17 @@ public:
return;
// this MenuItem object can get destroyed as a result of focus(), so we
// must get a local copy of the parent menu
// must get a local copy of anything we want to use here
// AFTER ~ClientMenuItem() is called.
FbTk::Menu *parent = menu();
FocusControl& focus_control = m_client.screen().focusControl();
m_client.focus();
fbwin->raise();
if ((mods & ControlMask) == 0) {
// Ignore any focus changes due to this menu closing
// (even in StrictMouseFocus mode)
m_client.screen().focusControl().ignoreAtPointer(true);
focus_control.ignoreAtPointer(true);
parent->hide();
}
}