Merge branch 'refs/heads/develop' into redesign

2014-07-12 20:39:26 +02:00
parent 3986de4ebc 687221f035
commit d1dfed2833
7 changed files with 19 additions and 15 deletions
@@ -208,7 +208,7 @@ class XBMC(Notification):
            log.debug('Returned from request %s: %s', (host, response))

            return response
-        except (MaxRetryError, requests.exceptions.Timeout):
+        except (MaxRetryError, requests.exceptions.Timeout, ConnectionError):
            log.info2('Couldn\'t send request to XBMC, assuming it\'s turned off')
            return []
        except: