Ensure we disconnect old menu model to prevent redundant updates

2 files changed, 20 insertions, 16 deletions

diff --git a/src/qtmenu.cpp b/src/qtmenu.cpp
index 689cc022..98ac4deb 100644
--- a/src/qtmenu.cpp
+++ b/src/qtmenu.cpp
@@ -188,7 +188,6 @@ int QtMenu::modelCount() const
     return -1;
 }
 
-
 void QtMenu::append_qmenuItem(QDeclarativeListProperty<QtMenuBase> *list, QtMenuBase *menuItem)
 {
     QtMenu *menu = qobject_cast<QtMenu *>(list->object);
@@ -199,4 +198,22 @@ void QtMenu::append_qmenuItem(QDeclarativeListProperty<QtMenuBase> *list, QtMenu
     }
 }
 
+void QtMenu::setModel(const QVariant &newModel) {
+    if (m_model != newModel) {
+
+        // Clean up any existing connections
+        if (QAbstractItemModel *oldModel = qobject_cast<QAbstractItemModel*>(m_model.value<QObject*>())) {
+            disconnect(oldModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SIGNAL(rebuildMenu()));
+        }
 
+        m_hasNativeModel = false;
+        m_model = newModel;
+        if (QAbstractItemModel *model = qobject_cast<QAbstractItemModel*>(newModel.value<QObject*>())) {
+            m_hasNativeModel = true;
+            connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SIGNAL(rebuildMenu()));
+        } else if (arg.canConvert(QVariant::StringList)) {
+            m_hasNativeModel = true;
+        }
+        emit modelChanged(m_model);
+    }
+}
diff --git a/src/qtmenu.h b/src/qtmenu.h
index 6d5a4740..3d149433 100644
--- a/src/qtmenu.h
+++ b/src/qtmenu.h
@@ -74,27 +74,14 @@ public:
     Q_INVOKABLE bool hasNativeModel() const { return m_hasNativeModel; }
 
 public slots:
-
-    void setModel(const QVariant arg) {
-        if (m_model != arg) {
-            m_hasNativeModel = false;
-            m_model = arg;
-            if (QAbstractItemModel *model = qobject_cast<QAbstractItemModel*>(arg.value<QObject*>())) {
-                m_hasNativeModel = true;
-                connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this, SIGNAL(rebuildMenu()));
-            } else if (arg.canConvert(QVariant::StringList)) {
-                m_hasNativeModel = true;
-            }
-            emit modelChanged(m_model);
-        }
-    }
+    void setModel(const QVariant &newModel);
 
 public:
 Q_SIGNALS:
     void menuClosed();
     void selectedIndexChanged();
     void hoveredIndexChanged();
-    void modelChanged(const QVariant&);
+    void modelChanged(const QVariant &newModel);
     void rebuldMenu();
 
 private Q_SLOTS: