libdbusmenu-qt5/avoid-shadowing-variable+fix-leak.diff

19 lines
628 B
Diff

=== 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 @@
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)) {
DMWARNING << "Application did not refresh before timeout";
}
+ watcher2->deleteLater();
}
}