From f6b0cc59ed8eb527c404910c77044ee801b80885 Mon Sep 17 00:00:00 2001 From: "Peter F. Patel-Schneider" Date: Fri, 3 Apr 2020 10:27:37 -0400 Subject: [PATCH] ui: only use file path for tray icon if icon name is file in current directory --- lib/solaar/ui/tray.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py index bcf1d7bf..02d791aa 100644 --- a/lib/solaar/ui/tray.py +++ b/lib/solaar/ui/tray.py @@ -18,6 +18,7 @@ ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from __future__ import absolute_import, division, print_function, unicode_literals +import os from logging import getLogger, DEBUG as _DEBUG _log = getLogger(__name__) @@ -167,6 +168,8 @@ try: # Defense against AppIndicator3 bug that treats files in current directory as icon files # https://bugs.launchpad.net/ubuntu/+source/libappindicator/+bug/1363277 def _icon_file(icon_name): + if not os.path.isfile(icon_name): + return icon_name icon_info = Gtk.IconTheme.get_default().lookup_icon(icon_name,_TRAY_ICON_SIZE,0) return icon_info.get_filename() if icon_info else icon_name