summaryrefslogtreecommitdiffstats
path: root/kicker
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-04-23 12:04:06 -0500
committerSlávek Banko <slavek.banko@axis.cz>2013-04-25 03:25:20 +0200
commitce52491d41fc9d424e46f98681191a8107fd5ee0 (patch)
tree619c845c27c12995a497e67ddaafdb1e4ddfc974 /kicker
parent0d94402df36d04300c23c08ecf3c99771313a43d (diff)
downloadtdebase-ce52491d41fc9d424e46f98681191a8107fd5ee0.tar.gz
tdebase-ce52491d41fc9d424e46f98681191a8107fd5ee0.zip
Fix sporadic Kicker crash in popup menu handler
This resolves Bug 1425 (cherry picked from commit 9e04189c586c7fc98097b0a42222d99621131c58)
Diffstat (limited to 'kicker')
-rw-r--r--kicker/taskbar/taskcontainer.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp
index 48dd57d35..34042b5fe 100644
--- a/kicker/taskbar/taskcontainer.cpp
+++ b/kicker/taskbar/taskcontainer.cpp
@@ -1179,7 +1179,9 @@ void TaskContainer::popupMenu(int action)
m_menu->installEventFilter( this );
m_menu->exec( pos );
- delete m_menu;
+ if (m_menu) {
+ delete m_menu;
+ }
m_menu = 0;
}