aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranz Koch <franz.koch@elements-net.de>2012-11-22 09:52:09 +0100
committerJonathan Marshall <jmarshall@never.you.mind>2012-12-01 14:45:20 +1300
commit09c5bd6005f5cd5a0eb2f51bf21cf95acbb1ce35 (patch)
tree0dd5b382ace0682c1df731abce87628621643fe6
parent4fdf2dfcef2e60a10efef4cef70196c36f9a1295 (diff)
[input] also use GetActiveWindowID for mouse input
-rw-r--r--xbmc/Application.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 3d16ad8adf..3d838f6b09 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -3118,12 +3118,8 @@ bool CApplication::ProcessMouse()
return true;
// Retrieve the corresponding action
- int iWin;
+ int iWin = GetActiveWindowID();
CKey key(mousecommand | KEY_MOUSE, (unsigned int) 0);
- if (g_windowManager.HasModalDialog())
- iWin = g_windowManager.GetTopMostModalDialogID() & WINDOW_ID_MASK;
- else
- iWin = g_windowManager.GetActiveWindow() & WINDOW_ID_MASK;
CAction mouseaction = CButtonTranslator::GetInstance().GetAction(iWin, key);
// If we couldn't find an action return false to indicate we have not