Fixing second reported bug in xbmc#13574 - apparently gcc overoptimiz…

…es critsections/checks.
Voyager1 · Dec 25, 2012 · a6058c0 · a6058c0
1 parent 5e98e17
commit a6058c0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/xbmc/music/karaoke/karaokelyricsmanager.cpp b/xbmc/music/karaoke/karaokelyricsmanager.cpp
@@ -109,12 +109,15 @@ bool CKaraokeLyricsManager::Start(const CStdString & strSongPath)
 
 void CKaraokeLyricsManager::Stop()
 {
-  CSingleLock lock (m_CritSection);
+  m_CritSection.lock();
 
   m_karaokeSongPlaying = false;
 
   if ( !m_Lyrics )
+  {
+    m_CritSection.unlock();
     return;
+  }
 
   // Clean up and close karaoke window when stopping
   CGUIWindowKaraokeLyrics *window = (CGUIWindowKaraokeLyrics*) g_windowManager.GetWindow(WINDOW_KARAOKELYRICS);
@@ -129,6 +132,8 @@ void CKaraokeLyricsManager::Stop()
   m_Lyrics->Shutdown();
   delete m_Lyrics;
   m_Lyrics = 0;
+
+  m_CritSection.unlock();
 }