Merge pull request #1742 from croneter/py3-fix-wrong-subs

Fix PKC sometimes selecting the wrong subtitle for direct paths

resources/lib/kodimonitor.py

@@ -343,6 +343,8 @@ class KodiMonitor(xbmc.Monitor):
         # Mechanik for Plex skip intro feature
         if utils.settings('enableSkipIntro') == 'true':
             status['intro_markers'] = item.api.intro_markers()
+        if item.playmethod is None and not path.startswith('plugin://'):
+            item.playmethod = v.PLAYBACK_METHOD_DIRECT_PATH
         item.playerid = playerid
         # Remember the currently playing item
         app.PLAYSTATE.item = item

resources/lib/subtitles.py

@@ -214,7 +214,8 @@ LANGUAGE_ISO_CODES = (
 
 
 def accessible_plex_subtitles(playmethod, playing_file, xml_streams):
-    if not playmethod == v.PLAYBACK_METHOD_DIRECT_PATH:
+    if playmethod not in (v.PLAYBACK_METHOD_DIRECT_PATH,
+                          v.PLAYBACK_METHOD_DIRECT_PLAY):
         # We can access all subtitles because we're downloading additional
         # external ones into the Kodi PKC add-on directory
         streams = []