summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2004-11-17 01:21:50 (GMT)
committermathias <mathias>2004-11-17 01:21:50 (GMT)
commitca5d12bbde61abfe3ad694464e58e01fa52fc389 (patch)
tree01346024779aab90a79d2cb02dfb34848e117d2d
parentb66caafa708019b0e22b67ba568cbf555769d5b2 (diff)
downloadfluxbox_lack-ca5d12bbde61abfe3ad694464e58e01fa52fc389.zip
fluxbox_lack-ca5d12bbde61abfe3ad694464e58e01fa52fc389.tar.bz2
fix bug in Screen destructor, can lead to segfault at exit/restart
-rw-r--r--src/Screen.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Screen.cc b/src/Screen.cc
index 2d5cf5e..da55b7e 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Screen.cc,v 1.296 2004/10/18 01:24:23 akir Exp $ 25// $Id$
26 26
27 27
28#include "Screen.hh" 28#include "Screen.hh"
@@ -408,6 +408,8 @@ BScreen::~BScreen() {
408 // we need to destroy it before we destroy workspaces 408 // we need to destroy it before we destroy workspaces
409 m_workspacemenu.reset(0); 409 m_workspacemenu.reset(0);
410 410
411 // slit must be destroyed before headAreas (Struts)
412 m_slit.reset(0);
411 413
412 if (geom_pixmap != None) 414 if (geom_pixmap != None)
413 imageControl().removeImage(geom_pixmap); 415 imageControl().removeImage(geom_pixmap);