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

fix segfault on restart/close when icons exist

Browse source
This commit is contained in:
rathnor 2003-05-04 13:04:31 +00:00
parent 2e3b3094af
commit 1762dd8a0b
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Screen.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Screen.cc,v 1.142 2003/04/28 22:43:26 fluxgen Exp $ // $Id: Screen.cc,v 1.143 2003/05/04 13:04:31 rathnor Exp $
#include "Screen.hh" #include "Screen.hh"
@ -959,10 +959,10 @@ void BScreen::removeIcon(FluxboxWindow *w) {
} }
void BScreen::removeWindow(FluxboxWindow *win) { void BScreen::removeWindow(FluxboxWindow *win) {
Workspaces::iterator it = workspacesList.begin(); if (win->isIconic())
Workspaces::iterator it_end = workspacesList.end(); removeIcon(win);
for (; it != it_end; ++it) else
(*it)->removeWindow(win); getWorkspace(win->getWorkspaceNumber())->removeWindow(win);
} }
@ -2276,10 +2276,7 @@ void BScreen::shutdown() {
workspacesList.end(), workspacesList.end(),
mem_fun(&Workspace::shutdown)); mem_fun(&Workspace::shutdown));
while (!iconList.empty()) {
iconList.back()->restore(true); // restore with remap
delete iconList.back(); // the window removes it self from iconlist
}
#ifdef SLIT #ifdef SLIT