diff --git a/avoid-shadowing-variable+fix-leak.diff b/avoid-shadowing-variable+fix-leak.diff index 8c06970..4bc5c1e 100644 --- a/avoid-shadowing-variable+fix-leak.diff +++ b/avoid-shadowing-variable+fix-leak.diff @@ -1,7 +1,7 @@ === 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 -@@ -553,10 +553,11 @@ +@@ -571,12 +571,13 @@ if (needRefresh || menu->actions().isEmpty()) { d->m_idsRefreshedByAboutToShow << id; @@ -9,7 +9,9 @@ - if (!d->waitForWatcher(watcher, REFRESH_TIMEOUT)) { + QDBusPendingCallWatcher *watcher2 = d->refresh(id); + if (!d->waitForWatcher(watcher2, REFRESH_TIMEOUT)) { + #ifndef QT_NO_DEBUG DMWARNING << "Application did not refresh before timeout"; + #endif } + watcher2->deleteLater(); }