Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #1835 from pieh/cancel_scan

fix: GUI freezes when cancelling update library
  • Loading branch information...
commit 880dfe9025d4f8fd66ee06d06ab47dce9127ba2b 2 parents 914e708 + 70d69ef
@jmarshallnz jmarshallnz authored
View
2  xbmc/music/infoscanner/MusicInfoScanner.cpp
@@ -355,7 +355,7 @@ void CMusicInfoScanner::Stop()
if (m_bCanInterrupt)
m_musicDatabase.Interupt();
- StopThread();
+ StopThread(false);
}
static void OnDirectoryScanned(const CStdString& strDirectory)
View
4 xbmc/video/VideoInfoScanner.cpp
@@ -189,7 +189,7 @@ namespace VIDEO
if (m_bCanInterrupt)
m_database.Interupt();
- StopThread();
+ StopThread(false);
}
void CVideoInfoScanner::CleanDatabase(CGUIDialogProgressBarHandle* handle /*= NULL */, const set<int>* paths /*= NULL */, bool showProgress /*= true */)
@@ -1863,7 +1863,7 @@ namespace VIDEO
MOVIELIST movielist;
CVideoInfoDownloader imdb(scraper);
int returncode = imdb.FindMovie(videoName, movielist, progress);
- if (returncode < 0 || (returncode == 0 && !DownloadFailed(progress)))
+ if (returncode < 0 || (returncode == 0 && (m_bStop || !DownloadFailed(progress))))
{ // scraper reported an error, or we had an error and user wants to cancel the scan
m_bStop = true;
return -1; // cancelled
Please sign in to comment.
Something went wrong with that request. Please try again.