Philipp Hörist pushed to branch master at gajim / gajim


Commits:
67f854f9 by André Apitzsch at 2020-07-03T17:08:57+02:00
MusicTrackListener: Catch all errors

Fixes #10164.

- - - - -


1 changed file:

- gajim/common/dbus/music_track.py


Changes:

=====================================
gajim/common/dbus/music_track.py
=====================================
@@ -85,10 +85,8 @@ class MusicTrackListener:
                 -1,
                 None)
         except GLib.Error as error:
-            if error.domain == 'g-dbus-error-quark':
-                log.debug("Could not list names: %s", error.message)
-                return
-            raise
+            log.debug("Could not list names: %s", error.message)
+            return
 
         for name in result[0]:
             if name.startswith(MPRIS_PLAYER_PREFIX):
@@ -199,12 +197,10 @@ class MusicTrackListener:
                 -1,
                 None)
         except GLib.Error as error:
-            if error.domain == 'g-dbus-error-quark':
-                log.debug("Could not enable music listener: %s", error.message)
-                return None
-            raise
-        else:
-            return self._get_music_info(result[0])
+            log.debug("Could not enable music listener: %s", error.message)
+            return None
+
+        return self._get_music_info(result[0])
 
 
 def enable():



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/67f854f95dc1a102bec5d46e652298b2812fa7fc

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/67f854f95dc1a102bec5d46e652298b2812fa7fc
You're receiving this email because of your account on dev.gajim.org.


_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits

Reply via email to