diff options
| author | Lars Op den Kamp <opdenkamp@gmail.com> | 2013-09-28 04:30:26 -0700 |
|---|---|---|
| committer | Lars Op den Kamp <opdenkamp@gmail.com> | 2013-09-28 04:30:26 -0700 |
| commit | 102623d4be36342819b8ff8813e794012959217c (patch) | |
| tree | 4e5465cb6f27030235068feb438ded2a28aeb5f6 | |
| parent | c21f135590db2411beb672340be6f84e134be9a2 (diff) | |
| parent | 97affeaa16882367af27bf9972e5cbec0cb2baac (diff) | |
Merge pull request #3263 from fetzerch/bugfix-osdchannels
pvr: Fix crash when opening PVROSDChannels while playing a recording
| -rw-r--r-- | xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp index 12eaded4f2..cc09fd15e3 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp @@ -95,8 +95,8 @@ bool CGUIDialogPVRChannelsOSD::OnMessage(CGUIMessage& message) void CGUIDialogPVRChannelsOSD::OnInitWindow() { - /* Close dialog immediately if now TV or radio channel is playing */ - if (!g_PVRManager.IsPlaying()) + /* Close dialog immediately if neither a TV nor a radio channel is playing */ + if (!g_PVRManager.IsPlayingTV() && !g_PVRManager.IsPlayingRadio()) { Close(); return; |