aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/lib/libPython/xbmcmodule/player.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/xbmc/lib/libPython/xbmcmodule/player.cpp b/xbmc/lib/libPython/xbmcmodule/player.cpp
index 092b022c94..1fcb3d2afc 100644
--- a/xbmc/lib/libPython/xbmcmodule/player.cpp
+++ b/xbmc/lib/libPython/xbmcmodule/player.cpp
@@ -470,12 +470,15 @@ namespace PYXBMC
char *cLine = NULL;
if (!PyArg_ParseTuple(args, (char*)"s", &cLine)) return NULL;
- int nStream = g_application.m_pPlayer->GetSubtitleCount();
+ if (g_application.m_pPlayer)
+ {
+ int nStream = g_application.m_pPlayer->GetSubtitleCount();
- g_settings.m_currentVideoSettings.m_SubtitleOn = true;
- g_application.m_pPlayer->SetSubtitleVisible(true);
- g_application.m_pPlayer->AddSubtitle(cLine);
- g_application.m_pPlayer->SetSubtitle(nStream);
+ g_settings.m_currentVideoSettings.m_SubtitleOn = true;
+ g_application.m_pPlayer->SetSubtitleVisible(true);
+ g_application.m_pPlayer->AddSubtitle(cLine);
+ g_application.m_pPlayer->SetSubtitle(nStream);
+ }
Py_INCREF(Py_None);
return Py_None;