You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
20 lines
705 B
20 lines
705 B
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);
|
|
}
|
|
}
|