From c07f87e35062e39e9d4b3b978362dbf94dd36fbb Mon Sep 17 00:00:00 2001
From: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
Date: Tue, 9 Oct 2012 15:44:25 -0300
Subject: Fixed crash during model destruction in QML.

---
 libqmenumodel/src/qdbusmenumodel.cpp |  4 ++--
 libqmenumodel/src/qmenumodel.cpp     | 14 +++++++++-----
 libqmenumodel/src/qmenumodel.h       |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'libqmenumodel/src')

diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp
index ae88c35..6d4746c 100644
--- a/libqmenumodel/src/qdbusmenumodel.cpp
+++ b/libqmenumodel/src/qdbusmenumodel.cpp
@@ -85,7 +85,7 @@ void QDBusMenuModel::stop()
 /*! \internal */
 void QDBusMenuModel::serviceVanish(GDBusConnection *)
 {
-    setMenuModel(NULL);
+    setMenuModel(NULL, true);
 }
 
 /*! \internal */
@@ -94,7 +94,7 @@ void QDBusMenuModel::serviceAppear(GDBusConnection *connection)
     GMenuModel *model = reinterpret_cast<GMenuModel*>(g_dbus_menu_model_get(connection,
                                                                             busName().toLatin1(),
                                                                             objectPath().toLatin1()));
-    setMenuModel(model);
+    setMenuModel(model, true);
     if (model == NULL) {
         stop();
     }
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp
index 4c0fc23..cac2f1a 100644
--- a/libqmenumodel/src/qmenumodel.cpp
+++ b/libqmenumodel/src/qmenumodel.cpp
@@ -46,23 +46,25 @@ QMenuModel::QMenuModel(GMenuModel *other, QObject *parent)
         rolesNames[Extra] = "extra";
     }
     setRoleNames(rolesNames);
-    setMenuModel(other);
+    setMenuModel(other, true);
 }
 
 /*! \internal */
 QMenuModel::~QMenuModel()
 {
-   setMenuModel(NULL);
+    setMenuModel(NULL, false);
 }
 
 /*! \internal */
-void QMenuModel::setMenuModel(GMenuModel *other)
+void QMenuModel::setMenuModel(GMenuModel *other, bool notify)
 {
     if (m_menuModel == other) {
         return;
     }
 
-    beginResetModel();
+    if (notify) {
+        beginResetModel();
+    }
 
     if (m_menuModel) {
         g_signal_handler_disconnect(m_menuModel, m_signalChangedId);
@@ -81,7 +83,9 @@ void QMenuModel::setMenuModel(GMenuModel *other)
                                              this);
     }
 
-    endResetModel();
+    if (notify) {
+        endResetModel();
+    }
 }
 
 /*! \internal */
diff --git a/libqmenumodel/src/qmenumodel.h b/libqmenumodel/src/qmenumodel.h
index 7520480..e482e9b 100644
--- a/libqmenumodel/src/qmenumodel.h
+++ b/libqmenumodel/src/qmenumodel.h
@@ -48,7 +48,7 @@ public:
 
 protected:
     QMenuModel(GMenuModel *other=0, QObject *parent=0);
-    void setMenuModel(GMenuModel *model);
+    void setMenuModel(GMenuModel *model, bool notify);
     GMenuModel *menuModel() const;
 
 private:
-- 
cgit v1.2.3