From 706f903299c39b06b6c9071af44255f50b14d089 Mon Sep 17 00:00:00 2001
From: shaun <shaun@bluebit.com.au>
Date: Sat, 14 Jan 2017 11:38:00 +1100
Subject: [PATCH] do the action and on except set the default

---
 resources/lib/player.py | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/resources/lib/player.py b/resources/lib/player.py
index aaf8c14d..13945f4e 100644
--- a/resources/lib/player.py
+++ b/resources/lib/player.py
@@ -167,21 +167,20 @@ class Player(xbmc.Player):
                 except:
                     tracks_data = None
 
-                if tracks_data is not None:
-                    try: # Audio tracks
-                        indexAudio = tracks_data['currentaudiostream']['index']
-                    except (KeyError, TypeError):
-                        indexAudio = 0
+                try: # Audio tracks
+                    indexAudio = tracks_data['currentaudiostream']['index']
+                except:
+                    indexAudio = 0
 
-                    try: # Subtitles tracks
-                        indexSubs = tracks_data['currentsubtitle']['index']
-                    except (KeyError, TypeError):
-                        indexSubs = 0
+                try: # Subtitles tracks
+                    indexSubs = tracks_data['currentsubtitle']['index']
+                except:
+                    indexSubs = 0
 
-                    try: # If subtitles are enabled
-                        subsEnabled = tracks_data['subtitleenabled']
-                    except (KeyError, TypeError):
-                        subsEnabled = ""
+                try: # If subtitles are enabled
+                    subsEnabled = tracks_data['subtitleenabled']
+                except:
+                    subsEnabled = ""
 
                 # Postdata for the audio
                 postdata['AudioStreamIndex'] = indexAudio + 1