From ce52491d41fc9d424e46f98681191a8107fd5ee0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 23 Apr 2013 12:04:06 -0500 Subject: [PATCH] Fix sporadic Kicker crash in popup menu handler This resolves Bug 1425 (cherry picked from commit 9e04189c586c7fc98097b0a42222d99621131c58) --- kicker/taskbar/taskcontainer.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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; }