[fix] internal calls to the now-deprecated lock/unlock xbmcgui functionality have...

diff --git a/xbmc/interfaces/legacy/ModuleXbmcgui.cpp b/xbmc/interfaces/legacy/ModuleXbmcgui.cpp
index 814dd3e..b0c6cdd 100644 (file)
--- a/xbmc/interfaces/legacy/ModuleXbmcgui.cpp
+++ b/xbmc/interfaces/legacy/ModuleXbmcgui.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "ModuleXbmcgui.h"
-
+#include "LanguageHook.h"
 #include "guilib/GraphicContext.h"
 #include "guilib/GUIWindowManager.h"
 #include "utils/log.h"
@@ -41,18 +41,16 @@ namespace XBMCAddon
 
     long getCurrentWindowId()
     {
-      lock();
-      int id = g_windowManager.GetActiveWindow();
-      unlock();
-      return id;
+      DelayedCallGuard dg;
+      CSingleLock gl(g_graphicsContext);
+      return g_windowManager.GetActiveWindow();
     }
 
     long getCurrentWindowDialogId()
     {
-      lock();
-      int id = g_windowManager.GetTopMostModalDialogID();
-      unlock();
-      return id;
+      DelayedCallGuard dg;
+      CSingleLock gl(g_graphicsContext);
+      return g_windowManager.GetTopMostModalDialogID();
     }
   }
 }