Skip to content

Commit

Permalink
fixed: deadlock on exit, app thread is waiting in CWebServer::Stop fo…
Browse files Browse the repository at this point in the history
…r the webserver to exit, webserver thread is waiting in CApplicationMessenger::SendMessage for app thread to process the message

(cherry picked from commit 79c4eb7b38ae1798ee95449d9dad7f1bd50569cb)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@33739 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
bobo1on1 committed Sep 13, 2010
1 parent 8a60afb commit 8440ae9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion xbmc/Application.cpp
Expand Up @@ -3270,6 +3270,8 @@ void CApplication::Stop()
if (videoScan)
videoScan->StopScanning();

m_applicationMessenger.Cleanup();

StopServices();
//Sleep(5000);

Expand Down Expand Up @@ -3300,7 +3302,6 @@ void CApplication::Stop()
CZeroconfBrowser::ReleaseInstance();
}
#endif
m_applicationMessenger.Cleanup();

CLog::Log(LOGNOTICE, "clean cached files!");
#ifdef HAS_FILESYSTEM_RAR
Expand Down

0 comments on commit 8440ae9

Please sign in to comment.