Skip to content

Commit c687c23

Browse files
author
Lee Miller
committed
Handle xdg.Exceptions.ParsingError in desktop_xdg plugin (fixes: #2089)
1 parent 1189628 commit c687c23

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

src/plugins/desktop_xdg.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@
22

33
import os
44

5-
from xdg import BaseDirectory, Menu
5+
from xdg import BaseDirectory, Menu, Exceptions
66

77

88
class DesktopXDG(object):
99
"""pyxdg Freedesktop desktop implementation"""
1010
def __init__(self):
11-
menu_entry = Menu.parse().getMenu('Office').getMenuEntry(
12-
'pybitmessage.desktop')
13-
self.desktop = menu_entry.DesktopEntry if menu_entry else None
11+
try:
12+
self.desktop = Menu.parse().getMenu('Office').getMenuEntry(
13+
'pybitmessage.desktop').DesktopEntry
14+
except Exceptions.ParsingError:
15+
raise TypeError # TypeError disables startonlogon
1416
appimage = os.getenv('APPIMAGE')
1517
if appimage:
1618
self.desktop.set('Exec', appimage)
1719

1820
def adjust_startonlogon(self, autostart=False):
1921
"""Configure autostart according to settings"""
20-
if not self.desktop:
21-
return
22-
2322
autostart_path = os.path.join(
2423
BaseDirectory.xdg_config_home, 'autostart', 'pybitmessage.desktop')
2524
if autostart:

0 commit comments

Comments
 (0)