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

Commits:
6207e607 by Philipp Hörist at 2018-03-24T21:57:40+01:00
Fix NoneType Error

element can be None if there was a error while calling Gst.ElementFactory.make()

- - - - -


1 changed file:

- gajim/common/multimedia_helpers.py


Changes:

=====================================
gajim/common/multimedia_helpers.py
=====================================
--- a/gajim/common/multimedia_helpers.py
+++ b/gajim/common/multimedia_helpers.py
@@ -14,9 +14,12 @@
 ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 
 import gi
+import logging
 gi.require_version('Gst', '1.0')
 from gi.repository import Gst
 
+log = logging.getLogger('gajim.c.multimedia_helpers')
+
 
 class DeviceManager(object):
     def __init__(self):
@@ -33,6 +36,8 @@ class DeviceManager(object):
     def detect_element(self, name, text, pipe='%s'):
         if Gst.ElementFactory.find(name):
             element = Gst.ElementFactory.make(name, '%spresencetest' % name)
+            if element is None:
+                log.warning('could not create %spresencetest', name)
             if hasattr(element.props, 'device'):
                 element.set_state(Gst.State.READY)
                 devices = element.get_properties('device')
@@ -49,7 +54,7 @@ class DeviceManager(object):
             else:
                 self.devices[text] = pipe % name
         else:
-            print('element \'%s\' not found' % name)
+            log.info('element %s not found', name)
 
 
 class AudioInputManager(DeviceManager):
@@ -108,4 +113,3 @@ class VideoOutputManager(DeviceManager):
         # ximagesink
         self.detect_element('ximagesink', _('X Window System (without Xv)'))
         self.detect_element('autovideosink', _('Autodetect'))
-



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/commit/6207e607a857c522997c94e79da08056cb3846a9

---
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/commit/6207e607a857c522997c94e79da08056cb3846a9
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