aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxhaggi <sascha.woo@gmail.com>2015-12-28 19:51:14 +0100
committerxhaggi <sascha.woo@gmail.com>2015-12-30 16:25:55 +0100
commit5efa63d45ec3fee9d1012bab32ec20f3be4e1a04 (patch)
treea5097409386c32e7fd5418e646cb3ae3aeca4e4f
parent76427449eaf8ee8dc6274406a8d19601eebddac6 (diff)
[fix][pvr] prevent numeric dialog from being opened if python modal is present
-rw-r--r--xbmc/pvr/PVRActionListener.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/xbmc/pvr/PVRActionListener.cpp b/xbmc/pvr/PVRActionListener.cpp
index bf3942e17c..d8e29a1c3a 100644
--- a/xbmc/pvr/PVRActionListener.cpp
+++ b/xbmc/pvr/PVRActionListener.cpp
@@ -90,6 +90,11 @@ bool CPVRActionListener::OnAction(const CAction &action)
(g_windowManager.IsWindowActive(WINDOW_FULLSCREEN_VIDEO) ||
g_windowManager.IsWindowActive(WINDOW_VISUALISATION)))
{
+ // do not consume action if a python modal is the top most dialog
+ // as a python modal can't return that it consumed the action.
+ if (g_windowManager.IsPythonWindow(g_windowManager.GetTopMostModalDialogID()))
+ return false;
+
if(g_PVRManager.IsPlaying())
{
// pvr client addon