diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-11-23 18:25:47 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-11-23 18:25:47 +0000 |
| commit | 68533d0fedf1bf3a0e6f45230e03222510dd6af6 (patch) | |
| tree | 78bad3b47623221cdcaf871305f77c71462faa13 /libqmenumodel/src/qmenumodel.cpp | |
| parent | 7cfd1a4cececa6a44aaa3c7c6b35f1886808467e (diff) | |
| parent | bdc349d16b6e88c64e6ad16513f33d71bf1a643d (diff) | |
| download | qmenumodel-68533d0fedf1bf3a0e6f45230e03222510dd6af6.tar.gz qmenumodel-68533d0fedf1bf3a0e6f45230e03222510dd6af6.tar.bz2 qmenumodel-68533d0fedf1bf3a0e6f45230e03222510dd6af6.zip | |
Fixed QMenumodel behavior when the GMenuModel is destroyed.
Approved by Lars Uebernickel, PS Jenkins bot.
Diffstat (limited to 'libqmenumodel/src/qmenumodel.cpp')
| -rw-r--r-- | libqmenumodel/src/qmenumodel.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp index 8735e6c..ec5570f 100644 --- a/libqmenumodel/src/qmenumodel.cpp +++ b/libqmenumodel/src/qmenumodel.cpp @@ -64,6 +64,7 @@ void QMenuModel::setMenuModel(GMenuModel *other) m_menuModel = other; if (m_menuModel) { + g_object_ref(m_menuModel); // this will trigger the menu load (void) g_menu_model_get_n_items(m_menuModel); m_signalChangedId = g_signal_connect(m_menuModel, @@ -185,7 +186,7 @@ QVariant QMenuModel::getLink(const QModelIndex &index, index.row(), linkName.toUtf8().data()); - if (link) { + if (link) { QMenuModel *other = new QMenuModel(link, const_cast<QMenuModel*>(this)); return QVariant::fromValue<QObject*>(other); } |