Fixed and3rson#37: Prevent crash importing dbus without a notificatio…

…n target
agg23 · Sep 18, 2018 · ec7e9dd · ec7e9dd
1 parent c271cec
commit ec7e9dd
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/clay/osd.py b/clay/osd.py
@@ -5,6 +5,7 @@
 
 from clay.notifications import notification_area
 from clay import meta
+from clay.log import logger
 
 IS_INIT = False
 
@@ -17,8 +18,7 @@
     ERROR_MESSAGE = 'Error while importing dbus: \'{}\''.format(str(exception))
 
 if not IS_INIT:
-    notification_area.notify(ERROR_MESSAGE)
-
+    logger.error(ERROR_MESSAGE)
 
 class _OSDManager(object):
     """
@@ -29,11 +29,14 @@ def __init__(self):
 
         if IS_INIT:
             self.bus = SessionBus()
-            self.notifcations = self.bus.get_object(
-                "org.freedesktop.Notifications",
-                "/org/freedesktop/Notifications"
-            )
-            self.notify_interface = Interface(self.notifcations, "org.freedesktop.Notifications")
+            try:
+                self.notifcations = self.bus.get_object(
+                    "org.freedesktop.Notifications",
+                    "/org/freedesktop/Notifications"
+                )
+                self.notify_interface = Interface(self.notifcations, "org.freedesktop.Notifications")
+            except Exception as exception:  # pylint: disable=broad-except
+                logger.error('Error while importing dbus: \'%s\'', str(exception))
 
     def notify(self, track):
         """