aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Brown <themagnificentmrb@gmail.com>2016-11-10 10:39:27 -0800
committerGarrett Brown <themagnificentmrb@gmail.com>2016-11-10 14:39:08 -0800
commit749c685b06c51031aaf4ed1a74ad0bc862cbce87 (patch)
tree2c657b8e8fd36b965f4f0602fb056c6889f6cf69
parent77ed200c8be27f8b2db7e5e81af50cf88b1a49fa (diff)
Fix new joystick dialog opening when dialog is above the controller dialog
-rw-r--r--xbmc/input/joysticks/dialogs/GUIDialogNewJoystick.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/input/joysticks/dialogs/GUIDialogNewJoystick.cpp b/xbmc/input/joysticks/dialogs/GUIDialogNewJoystick.cpp
index 849b99fdae..1817d02917 100644
--- a/xbmc/input/joysticks/dialogs/GUIDialogNewJoystick.cpp
+++ b/xbmc/input/joysticks/dialogs/GUIDialogNewJoystick.cpp
@@ -39,7 +39,7 @@ void CGUIDialogNewJoystick::ShowAsync()
bShow = false;
else if (!CSettings::GetInstance().GetBool(CSettings::SETTING_INPUT_ASKNEWCONTROLLERS))
bShow = false;
- else if (g_windowManager.GetActiveWindow() == WINDOW_DIALOG_GAME_CONTROLLERS)
+ else if (g_windowManager.IsWindowActive(WINDOW_DIALOG_GAME_CONTROLLERS, false))
bShow = false;
if (bShow)