From a4f3af23bf08f7aff4763e523524a1f5dc23af66 Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 3 Nov 2013 14:31:45 +0100 Subject: [PATCH] libspark/playback: add more player checks --- libspark/playback_libeplayer3.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp index 9f74aff..c11d22b 100644 --- a/libspark/playback_libeplayer3.cpp +++ b/libspark/playback_libeplayer3.cpp @@ -213,7 +213,7 @@ bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, un { //pause playback in case of timeshift //FIXME: no picture on tv - if (player->playback->Command(player, PLAYBACK_PAUSE, NULL) < 0) + if (!player || !player->playback || player->playback->Command(player, PLAYBACK_PAUSE, NULL) < 0) { ret = false; printf("failed to pause playback\n"); @@ -268,8 +268,7 @@ bool cPlayback::Stop(void) player->playback->Command(player,PLAYBACK_CLOSE, NULL); if(player) free(player); - if(player != NULL) - player = NULL; + player = NULL; playing=false; return true; @@ -412,7 +411,8 @@ bool cPlayback::GetSpeed(int &speed) const void cPlayback::GetPts(uint64_t &pts) { - player->playback->Command(player, PLAYBACK_PTS, (void*)&pts); + if (player && player->playback) + player->playback->Command(player, PLAYBACK_PTS, (void*)&pts); } // in milliseconds