aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Woo <sascha.woo@gmail.com>2015-07-30 07:51:35 +0200
committerSascha Woo <sascha.woo@gmail.com>2015-07-30 07:51:35 +0200
commit7287f3a9d63917c1920edb031eeb50f3c56e903c (patch)
tree9c0c60ab3d9149276a890b61513c961882691c99
parentdcce393e394fecb784642f46098d9ae62b28baec (diff)
parent8e37c7c82c7ae78899f82a8c5859156e04febe18 (diff)
Merge pull request #7646 from xhaggi/fix-missing-return-in-pvr-base-window-onback
[pvr] fix missing return in CGUIWindowPVRBase::OnBack (fixes #16150)
-rw-r--r--xbmc/pvr/windows/GUIWindowPVRBase.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/xbmc/pvr/windows/GUIWindowPVRBase.cpp b/xbmc/pvr/windows/GUIWindowPVRBase.cpp
index 0a0724cced..036d89a4f9 100644
--- a/xbmc/pvr/windows/GUIWindowPVRBase.cpp
+++ b/xbmc/pvr/windows/GUIWindowPVRBase.cpp
@@ -111,7 +111,10 @@ bool CGUIWindowPVRBase::OnBack(int actionID)
{
// don't call CGUIMediaWindow as it will attempt to go to the parent folder which we don't want.
if (GetPreviousWindow() != WINDOW_FULLSCREEN_LIVETV)
+ {
g_windowManager.ActivateWindow(WINDOW_HOME);
+ return true;
+ }
else
return CGUIWindow::OnBack(actionID);
}