Avoid infinite recursion when no icon is available.
This commit is contained in:
parent
3ed508a9b0
commit
8d4c93c600
3
debian/changelog
vendored
3
debian/changelog
vendored
@ -17,6 +17,9 @@ lxqt-panel (0.12.0-8ubuntu1) UNRELEASED; urgency=medium
|
|||||||
+ taskbar: Avoid conditionals on unintialized values by proper
|
+ taskbar: Avoid conditionals on unintialized values by proper
|
||||||
initialization of data members
|
initialization of data members
|
||||||
* Upstream commit 1cb5778.
|
* Upstream commit 1cb5778.
|
||||||
|
- Avoid infinite recursion when no icon is available.
|
||||||
|
+ avoid-infinite-recursion-icons.patch
|
||||||
|
+ Upstream commit b9b4133.
|
||||||
|
|
||||||
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 05 Feb 2018 19:00:18 -0600
|
-- Simon Quigley <tsimonq2@ubuntu.com> Mon, 05 Feb 2018 19:00:18 -0600
|
||||||
|
|
||||||
|
19
debian/patches/avoid-infinite-recursion-icons.patch
vendored
Normal file
19
debian/patches/avoid-infinite-recursion-icons.patch
vendored
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
Description: Avoid infinite recursion when no icon is available
|
||||||
|
Author: comicfans <comicfans44@gmail.com>
|
||||||
|
Origin: backport
|
||||||
|
Bug: https://github.com/lxde/lxqt/issues/1431
|
||||||
|
Applied-Upstream: b9b4133
|
||||||
|
Last-Update: 2018-02-05
|
||||||
|
--- a/plugin-mainmenu/xdgcachedmenu.cpp
|
||||||
|
+++ b/plugin-mainmenu/xdgcachedmenu.cpp
|
||||||
|
@@ -60,6 +60,10 @@ void XdgCachedMenuAction::updateIcon()
|
||||||
|
if(icon().isNull())
|
||||||
|
{
|
||||||
|
QIcon icon = XdgIcon::fromTheme(iconName_, QIcon::fromTheme("unknown"));
|
||||||
|
+ // Some themes may lack the "unknown" icon; checking null prevents
|
||||||
|
+ // infinite recursion (setIcon->dataChanged->updateIcon->setIcon)
|
||||||
|
+ if (icon.isNull())
|
||||||
|
+ return;
|
||||||
|
setIcon(icon);
|
||||||
|
}
|
||||||
|
}
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -6,3 +6,4 @@ plugin-volume-mixer.patch
|
|||||||
fix-wrongly-positioned-popups.patch
|
fix-wrongly-positioned-popups.patch
|
||||||
use-specific-panel-icon.patch
|
use-specific-panel-icon.patch
|
||||||
fix-memory-leaks.patch
|
fix-memory-leaks.patch
|
||||||
|
avoid-infinite-recursion-icons.patch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user