Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #3124 from koying/fixplugingetdirlock

FIX: avoid waiting forever on a locked CPluginDirectory while exiting
  • Loading branch information...
commit 2df043ac2f0936dc7f8e9fa24246119bddd4202c 2 parents 6742497 + fdbdda2
Jim Carroll authored
Showing with 4 additions and 4 deletions.
  1. +3 −3 xbmc/Application.cpp
  2. +1 −1  xbmc/filesystem/PluginDirectory.cpp
6 xbmc/Application.cpp
View
@@ -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();
2  xbmc/filesystem/PluginDirectory.cpp
View
@@ -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))
{
Please sign in to comment.
Something went wrong with that request. Please try again.