Avoid infinite recursion when no icon is available.

debian/changelog

@@ -17,6 +17,9 @@ lxqt-panel (0.12.0-8ubuntu1) UNRELEASED; urgency=medium
       + taskbar: Avoid conditionals on unintialized values by proper
         initialization of data members
         * 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
 

debian/patches/avoid-infinite-recursion-icons.patch

@@ -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);
+     }
+ }

debian/patches/series

@@ -6,3 +6,4 @@ plugin-volume-mixer.patch
 fix-wrongly-positioned-popups.patch
 use-specific-panel-icon.patch
 fix-memory-leaks.patch
+avoid-infinite-recursion-icons.patch