Merge pull request #3124 from koying/fixplugingetdirlock

FIX: avoid waiting forever on a locked CPluginDirectory while exiting
xbmc · Sep 26, 2013 · 2df043a · 2df043a
2 parents 6742497 + fdbdda2
commit 2df043a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
@@ -3369,9 +3369,6 @@ void CApplication::Stop(int exitCode)
 
     SaveFileState(true);
 
-    // cancel any jobs from the jobmanager
-    CJobManager::GetInstance().CancelJobs();
-
     g_alarmClock.StopThread();
 
     if( m_bSystemScreenSaverEnable )
@@ -3394,6 +3391,9 @@ void CApplication::Stop(int exitCode)
     m_ExitCode = exitCode;
     CLog::Log(LOGNOTICE, "stop all");
 
+    // cancel any jobs from the jobmanager
+    CJobManager::GetInstance().CancelJobs();
+
     // stop scanning before we kill the network and so on
     if (m_musicInfoScanner->IsScanning())
       m_musicInfoScanner->Stop();

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