Merge pull request #16422 from enen92/addonbackport

[PlaylistPlayer] Do not attempt to further resolve plugin paths for failing entries
xbmc · Jul 31, 2019 · 862f940 · 862f940
2 parents 7a48397 + 06593e8
commit 862f940
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/xbmc/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp
@@ -898,7 +898,8 @@ void PLAYLIST::CPlayListPlayer::OnApplicationMessage(KODI::MESSAGING::ThreadMess
           // resolve only for a maximum of 5 times to avoid deadlocks (plugin:// paths can resolve to plugin:// paths)
           for (int i = 0; URIUtils::IsPlugin(item->GetDynPath()) && i < 5; ++i)
           {
-            XFILE::CPluginDirectory::GetPluginResult(item->GetDynPath(), *item, true);
+            if (!XFILE::CPluginDirectory::GetPluginResult(item->GetDynPath(), *item, true))
+              return;
           }
           if (item->IsAudio() || item->IsVideo())
             Play(item, pMsg->strParam);