fixed: Ticket #10752 freeze when trying to login

xbmc · May 9, 2011 · 51e528a · 51e528a
1 parent 366bf45
commit 51e528a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/xbmc/network/libscrobbler/scrobbler.cpp b/xbmc/network/libscrobbler/scrobbler.cpp
@@ -48,7 +48,6 @@
 CScrobbler::CScrobbler(const CStdString &strHandshakeURL, const CStdString &strLogPrefix)
   : CThread()
 { 
-  m_bRunThread      = false;
   m_bBanned         = false;
   m_bBadAuth        = false;
   m_pHttp           = NULL;
@@ -72,14 +71,12 @@ void CScrobbler::Init()
   ResetState();
   LoadCredentials();
   LoadJournal();
-  if (!m_bRunThread)
+  if (!ThreadHandle())
     Create();
 }
 
 void CScrobbler::Term()
 {
-  m_bRunThread = false;
-  SetEvent(m_hEvent);
   StopThread();
   SaveJournal();
 }
@@ -643,11 +640,10 @@ void CScrobbler::Process()
     if (!(m_pHttp = new XFILE::CFileCurl))
       return;
   }
-  m_bRunThread = true;
-  while (1)
+  while (!m_bStop)
   {
     WaitForSingleObject(m_hEvent, INFINITE);
-    if (!m_bRunThread)
+	if (m_bStop)
       break;
 
     if (m_strSessionID.IsEmpty())

diff --git a/xbmc/network/libscrobbler/scrobbler.h b/xbmc/network/libscrobbler/scrobbler.h
@@ -113,7 +113,6 @@ typedef std::vector<SubmissionJournalEntry>::iterator SCROBBLERJOURNALITERATOR;
 class CScrobbler : public CThread
 {
 protected:
-  bool m_bRunThread;
   bool m_bNotified;
   bool m_bSubmitting;
   bool m_bSubmitted;