Merge pull request #13346 from xhaggi/fix-window-is-condition

[fix] boolean condition window.is does not work properly
xbmc · Jan 11, 2018 · 3faae1e · 3faae1e
2 parents f638e40 + 864f3ce
commit 3faae1e
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
@@ -7670,6 +7670,16 @@ bool CGUIInfoManager::GetMultiInfoBool(const GUIInfo &info, int contextWindow, c
         if (info.GetData1())
         {
           CGUIWindow *window = g_windowManager.GetWindow(contextWindow);
+          if (!window)
+          {
+            // try topmost dialog
+            window = g_windowManager.GetWindow(g_windowManager.GetTopMostModalDialogID());
+            if (!window)
+            {
+              // try active window
+              window = g_windowManager.GetWindow(g_windowManager.GetActiveWindow());
+            }
+          }
           bReturn = (window && window->GetID() == static_cast<int>(info.GetData1()));
         }
         else