From 0b31bc94b323801b4995fd32b20d5dc9463a0255 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Sun, 16 Mar 2014 09:36:04 -0500
Subject: when an action's model changes in UnityMenuAction::setModel(), make
 sure the action unregisters itself from the previous model.

---
 libqmenumodel/src/unitymenuaction.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'libqmenumodel/src/unitymenuaction.cpp')

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);
-- 
cgit v1.2.3