changed: rename critsection variable to prevent confusion with the cs variable from...

diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
index 7d6f7aa..e9c2eaf 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogSubtitles.cpp
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.cpp
@@ -177,7 +177,7 @@ void CGUIDialogSubtitles::Process(unsigned int currentTime, CDirtyRegionList &di
     std::string status;
     CFileItemList subs;
     {
-      CSingleLock lock(m_section);
+      CSingleLock lock(m_critsection);
       status = m_status;
       subs.Assign(*m_subtitles);
     }
@@ -322,7 +322,7 @@ void CGUIDialogSubtitles::OnJobComplete(unsigned int jobID, bool success, CJob *
 
 void CGUIDialogSubtitles::OnSearchComplete(const CFileItemList *items)
 {
-  CSingleLock lock(m_section);
+  CSingleLock lock(m_critsection);
   m_subtitles->Assign(*items);
   UpdateStatus(SEARCH_COMPLETE);
   m_updateSubsList = true;
@@ -331,7 +331,7 @@ void CGUIDialogSubtitles::OnSearchComplete(const CFileItemList *items)
 
 void CGUIDialogSubtitles::UpdateStatus(STATUS status)
 {
-  CSingleLock lock(m_section);
+  CSingleLock lock(m_critsection);
   std::string label;
   switch (status)
   {
@@ -451,7 +451,7 @@ void CGUIDialogSubtitles::ClearSubtitles()
 {
   CGUIMessage msg(GUI_MSG_LABEL_RESET, GetID(), CONTROL_SUBLIST);
   OnMessage(msg);
-  CSingleLock lock(m_section);
+  CSingleLock lock(m_critsection);
   m_subtitles->Clear();
 }
 

diff --git a/xbmc/video/dialogs/GUIDialogSubtitles.h b/xbmc/video/dialogs/GUIDialogSubtitles.h
index 18705ca..14777c8 100644 (file)
--- a/xbmc/video/dialogs/GUIDialogSubtitles.h
+++ b/xbmc/video/dialogs/GUIDialogSubtitles.h
@@ -57,7 +57,7 @@ protected:
 
   void SetSubtitles(const std::string &subtitle);
 
-  CCriticalSection m_section;
+  CCriticalSection m_critsection;
   CFileItemList* m_subtitles;
   CFileItemList* m_serviceItems;
   std::string    m_currentService;