2015-05-11 22:40:04 +02:00
|
|
|
=== modified file 'src/dbusmenuimporter.cpp'
|
|
|
|
--- src/dbusmenuimporter.cpp 2015-05-05 19:42:58 +0000
|
|
|
|
+++ src/dbusmenuimporter.cpp 2015-05-05 19:54:13 +0000
|
2015-05-11 22:44:48 +02:00
|
|
|
@@ -571,12 +571,13 @@
|
2015-05-11 22:40:04 +02:00
|
|
|
|
|
|
|
if (needRefresh || menu->actions().isEmpty()) {
|
|
|
|
d->m_idsRefreshedByAboutToShow << id;
|
|
|
|
- watcher = d->refresh(id);
|
|
|
|
- if (!d->waitForWatcher(watcher, REFRESH_TIMEOUT)) {
|
|
|
|
+ QDBusPendingCallWatcher *watcher2 = d->refresh(id);
|
|
|
|
+ if (!d->waitForWatcher(watcher2, REFRESH_TIMEOUT)) {
|
2015-05-11 22:44:48 +02:00
|
|
|
#ifndef QT_NO_DEBUG
|
2015-05-11 22:40:04 +02:00
|
|
|
DMWARNING << "Application did not refresh before timeout";
|
2015-05-11 22:44:48 +02:00
|
|
|
#endif
|
2015-05-11 22:40:04 +02:00
|
|
|
}
|
|
|
|
+ watcher2->deleteLater();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|