diff options
| author | Timothy Pearson <[email protected]> | 2013-04-25 08:34:19 -0500 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-04-25 08:34:19 -0500 |
| commit | 704eedf364cefe87cf5c63cb61a3c6051a37a585 (patch) | |
| tree | ee1ba694ad783a3a4ab4fadbb831a2e98c8e3f73 /kicker | |
| parent | 33dc3f2d3960e4a7e5d51b00a6e511a7e326d36f (diff) | |
| parent | 1c7bdfda1e7c768525a73d1ca104db53ff1cec10 (diff) | |
| download | tdebase-704eedf364cefe87cf5c63cb61a3c6051a37a585.tar.gz tdebase-704eedf364cefe87cf5c63cb61a3c6051a37a585.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kicker')
| -rw-r--r-- | kicker/taskbar/taskcontainer.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kicker/taskbar/taskcontainer.cpp b/kicker/taskbar/taskcontainer.cpp index d29321382..fa3b560a8 100644 --- a/kicker/taskbar/taskcontainer.cpp +++ b/kicker/taskbar/taskcontainer.cpp @@ -1258,7 +1258,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; } |