Merge pull request #3 from ArchieMeng/matrix

fix bug: crash on opening subtitles
XBMC-Addons · Mar 6, 2021 · c7ad3f4 · c7ad3f4
2 parents 575859c + 9b01e5a
commit c7ad3f4
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/xbmcswift2/xbmcmixin.py b/lib/xbmcswift2/xbmcmixin.py
@@ -312,9 +312,13 @@ def _add_subtitles(self, subtitles):
         # this method.
         player = xbmc.Player()
         monitor = xbmc.Monitor()
-        for _ in range(30) and not monitor.abortRequested():
+        for _ in range(30):
             if player.isPlaying():
                 break
+
+            if monitor.abortRequested():
+                return
+
             monitor.waitForAbort(1)
         else:
             raise Exception('No video playing. Aborted after 30 seconds.')