CApplicationMessenger::ActivateWindow() can call back into python, so make sure we...
authorJonathan Marshall <jmarshall@xbmc.org>
Sat, 4 Jan 2014 07:30:46 +0000 (20:30 +1300)
committerJonathan Marshall <jmarshall@xbmc.org>
Sat, 4 Jan 2014 07:30:57 +0000 (20:30 +1300)
xbmc/interfaces/legacy/Window.cpp

index f97d1e4..9192808 100644 (file)
@@ -683,7 +683,10 @@ namespace XBMCAddon
         PulseActionEvent();
 
       std::vector<CStdString> params;
-      CApplicationMessenger::Get().ActivateWindow(iOldWindowId, params, false);
+      {
+        DelayedCallGuard dcguard(languageHook);
+        CApplicationMessenger::Get().ActivateWindow(iOldWindowId, params, false);
+      }
 
       iOldWindowId = 0;
     }