aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-07-04 07:37:52 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-07-04 07:37:52 +0000
commitd83588e3e3ba9a3410e4e122f6a06f61d68c7a09 (patch)
tree3741fbd9fcfb4aac5c930d181e305258c2a51c56
parentc7955b4f04e5a9a2530ad340b1801a81e37ea72c (diff)
parent0b31bc94b323801b4995fd32b20d5dc9463a0255 (diff)
downloadqmenumodel-d83588e3e3ba9a3410e4e122f6a06f61d68c7a09.tar.gz
qmenumodel-d83588e3e3ba9a3410e4e122f6a06f61d68c7a09.tar.bz2
qmenumodel-d83588e3e3ba9a3410e4e122f6a06f61d68c7a09.zip
Fix a dangling UnityMenuAction pointer by ensuring it's registered with only one menu at a time. Fixes: 1282282
-rw-r--r--libqmenumodel/src/unitymenuaction.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/libqmenumodel/src/unitymenuaction.cpp b/libqmenumodel/src/unitymenuaction.cpp
index 46edf16..6f564d1 100644
--- a/libqmenumodel/src/unitymenuaction.cpp
+++ b/libqmenumodel/src/unitymenuaction.cpp
@@ -59,9 +59,7 @@ UnityMenuModel* UnityMenuAction::model() const
void UnityMenuAction::setModel(UnityMenuModel* model)
{
if (m_model != model) {
- if (!model) {
- unregisterAction();
- }
+ unregisterAction();
m_model = model;
registerAction();
Q_EMIT modelChanged(model);