diff options
| author | Chris "Koying" Browet <cbro@semperpax.com> | 2013-08-16 13:50:47 +0200 |
|---|---|---|
| committer | Chris "Koying" Browet <cbro@semperpax.com> | 2013-08-19 14:25:25 +0200 |
| commit | fdbdda2b8a96131bde653617a7df7851b69fd967 (patch) | |
| tree | 8325dfb255e77a2335b5a25b662f100013bcfb6b /xbmc/filesystem/PluginDirectory.cpp | |
| parent | 6b3ff42a52c241caaaf0596ab0a3417bf1f04c7a (diff) | |
FIX: avoid waiting forever on a locked CPluginDirectory while exiting
Diffstat (limited to 'xbmc/filesystem/PluginDirectory.cpp')
| -rw-r--r-- | xbmc/filesystem/PluginDirectory.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp index 438cd7b044..6c95b3ddd8 100644 --- a/xbmc/filesystem/PluginDirectory.cpp +++ b/xbmc/filesystem/PluginDirectory.cpp @@ -529,7 +529,7 @@ bool CPluginDirectory::WaitOnScriptResult(const CStdString &scriptPath, int scri cancelled = true; startTime = XbmcThreads::SystemClockMillis(); } - if (cancelled && XbmcThreads::SystemClockMillis() - startTime > timeToKillScript) + if ((cancelled && XbmcThreads::SystemClockMillis() - startTime > timeToKillScript) || g_application.m_bStop) { // cancel our script if (scriptId != -1 && CScriptInvocationManager::Get().IsRunning(scriptId)) { |