Merge pull request #634 from anxdpanic/pr_isengard

2.6.0~beta3

Author: anxdpanic

addon.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.twitch" version="2.6.0~beta2" name="Twitch" provider-name="anxdpanic, A Talented Community">
+<addon id="plugin.video.twitch" version="2.6.0~beta3" name="Twitch" provider-name="anxdpanic, A Talented Community">
     <requires>
         <import addon="xbmc.python" version="2.20.0"/>
         <import addon="script.module.six" version="1.11.0"/>

resources/lib/twitch_addon/addon/api.py

@@ -337,23 +337,24 @@ def error_check(results):
         if isinstance(results, list):
             return results
 
-        if ('error' in results.get('response', {})) and (results['response']['status'] == 401):
+        payload = results.copy()
+        if 'response' in payload:
+            payload = payload['response']
+
+        if ('error' in payload) and (payload['status'] == 401):
             _ = kodi.Dialog().ok(
                 i18n('oauth_heading'),
                 i18n('oauth_message') % (i18n('settings'), i18n('login'), i18n('get_oauth_token'))
             )
             sys.exit()
 
-        if 'stream' in results and results['stream'] is None:
+        if 'stream' in payload and payload['stream'] is None:
             raise PlaybackFailed()
 
-        if 'error' in results.get('response', {}):
-            raise TwitchException(results)
-
-        if 'response' in results:
-            return results['response']
+        if 'error' in payload:
+            raise TwitchException(payload)
 
-        return results
+        return payload
 
     @staticmethod
     def return_boolean(results):