pool/libdbusmenu-qt5
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/KDE:Qt5/libdbusmenu-qt5?expand=0&rev=21

Browse Source
This commit is contained in:
Hrvoje Senjan 2015-05-11 20:44:48 +00:00 committed by Git OBS Bridge
parent d69e2856e1
commit ad8ccdad57
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
avoid-shadowing-variable+fix-leak.diff
View File

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