diff options
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)) { |