diff options
Diffstat (limited to 'extra/appmenu-qt/appmenu-async.diff')
| -rw-r--r-- | extra/appmenu-qt/appmenu-async.diff | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/extra/appmenu-qt/appmenu-async.diff b/extra/appmenu-qt/appmenu-async.diff index c4bc509d7..59e3ce791 100644 --- a/extra/appmenu-qt/appmenu-async.diff +++ b/extra/appmenu-qt/appmenu-async.diff @@ -119,3 +119,31 @@ + </interface> +</node> +=== modified file 'src/appmenuplatformmenubar.cpp' +--- src/appmenuplatformmenubar.cpp 2013-01-11 15:05:38 +0000 ++++ src/appmenuplatformmenubar.cpp 2013-01-14 16:01:25 +0000 +@@ -410,6 +410,10 @@ + registrar = new com::canonical::AppMenu::Registrar(REGISTRAR_SERVICE, REGISTRAR_PATH, QDBusConnection::sessionBus(), 0); + } + ++ if (!registrar || !registrar->isValid()) { ++ return false; ++ } ++ + Q_FOREACH(QAction *action, m_menuBar->actions()) { + if (!action->isSeparator()) { + m_rootMenu->addAction(action); +@@ -430,9 +434,9 @@ + } + + m_registeredWinId = winId; +- if (registrar) { +- registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); +- } ++ ++ registrar->RegisterWindow(winId, QDBusObjectPath(m_objectPath)); ++ + return true; + } + + |