aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-24 13:34:14 (GMT)
committersimonb <simonb>2006-04-24 13:34:14 (GMT)
commitf6a072430d4de159e229d6172adc5ba5ae985512 (patch)
treee87832fba92188131c4e9441b72c0e9c03666660 /src/fluxbox.cc
parent731f0deaafff3a4fe4353bbfc421a5dc3d5a2337 (diff)
downloadfluxbox-f6a072430d4de159e229d6172adc5ba5ae985512.zip
fluxbox-f6a072430d4de159e229d6172adc5ba5ae985512.tar.bz2
fix memory leaks in menu code
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index f5066b7..c18cc32 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -418,12 +418,6 @@ Fluxbox::~Fluxbox() {
418 delete m_toolbars.back(); 418 delete m_toolbars.back();
419 m_toolbars.pop_back(); 419 m_toolbars.pop_back();
420 } 420 }
421
422 // destroy screens
423 while (!m_screen_list.empty()) {
424 delete m_screen_list.back();
425 m_screen_list.pop_back();
426 }
427 421
428 // destroy atomhandlers 422 // destroy atomhandlers
429 for (AtomHandlerContainerIt it= m_atomhandler.begin(); 423 for (AtomHandlerContainerIt it= m_atomhandler.begin();
@@ -433,6 +427,13 @@ Fluxbox::~Fluxbox() {
433 } 427 }
434 m_atomhandler.clear(); 428 m_atomhandler.clear();
435 429
430 // destroy screens (after others, as they may do screen things)
431 while (!m_screen_list.empty()) {
432 delete m_screen_list.back();
433 m_screen_list.pop_back();
434 }
435
436
436 clearMenuFilenames(); 437 clearMenuFilenames();
437} 438}
438 439