aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmarshallnz <jcmarsha@gmail.com>2014-03-04 08:10:53 +1300
committerjmarshallnz <jcmarsha@gmail.com>2014-03-04 08:10:53 +1300
commitab0aec4057992edc875e4cd733eb80dc79dbfb4a (patch)
tree7087ee409f6b6b9482b8c38a0eeeabd9e25429a6
parent20fcb2282b9afe5f45d269f5f5eda16c9d547d2a (diff)
parentade71195bced3345867f59de88cec5a3eb21df0c (diff)
Merge pull request #4312 from wsoltys/pvrfix
fixed exception because of accessing an uninitialized playingChannel object
-rw-r--r--xbmc/video/windows/GUIWindowFullScreen.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/xbmc/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp
index 090b8fc64b..92919e031e 100644
--- a/xbmc/video/windows/GUIWindowFullScreen.cpp
+++ b/xbmc/video/windows/GUIWindowFullScreen.cpp
@@ -237,7 +237,8 @@ bool CGUIWindowFullScreen::OnAction(const CAction &action)
if (g_application.CurrentFileItem().IsLiveTV())
{
CPVRChannelPtr playingChannel;
- g_PVRManager.GetCurrentChannel(playingChannel);
+ if(!g_PVRManager.GetCurrentChannel(playingChannel))
+ return false;
if (action.GetID() == REMOTE_0)
{