From e53424ba0ba5f75015bddf1fbaf2dadc5623fa7e Mon Sep 17 00:00:00 2001 From: Frank Neumann Date: Sun, 21 May 2017 20:26:30 +0200 Subject: Commit status_c.diff (thx gda) --- status.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) (limited to 'status.c') diff --git a/status.c b/status.c index 604c1c2..24328b8 100644 --- a/status.c +++ b/status.c @@ -44,7 +44,7 @@ void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name, if (On) { mReplayMode = replayMPlayer; - if (strlen(Name) > 6 && Name[0]=='[' && Name[3]==']' && Name[5]=='(') { + if (Name != NULL && strlen(Name) > 6 && Name[0]=='[' && Name[3]==']' && Name[5]=='(') { int i; for (i = 6; Name[i]; ++i) { if (Name[i] == ' ' && Name[i-1] == ')') @@ -60,24 +60,26 @@ void cText2SkinStatus::Replaying(const cControl* /*Control*/, const char *Name, mReplay = rec; mReplayMode = replayNormal; } - else if (strcmp(Name, "DVD") == 0) - mReplayMode = replayDVD; - else if (strcmp(Name, "VCD") == 0) - mReplayMode = replayVCD; - else if (access(Name, F_OK) == 0) - mReplayMode = replayMPlayer; - else if (strncmp(Name, "[image]", 7) == 0) - mReplayMode = replayImage; - else if (strncmp(Name, "[cdda]", 6) == 0) - mReplayMode = replayAudioCd; - else if (strlen(Name) > 7) { - int i, n; - for (i = 0, n = 0; Name[i]; ++i) { - if (Name[i] == ' ' && Name[i-1] == ',' && ++n == 4) - break; - } - if (Name[i]) { // replaying DVD + else if (Name != NULL) { + if (strcmp(Name, "DVD") == 0) mReplayMode = replayDVD; + else if (strcmp(Name, "VCD") == 0) + mReplayMode = replayVCD; + else if (access(Name, F_OK) == 0) + mReplayMode = replayMPlayer; + else if (strncmp(Name, "[image]", 7) == 0) + mReplayMode = replayImage; + else if (strncmp(Name, "[cdda]", 6) == 0) + mReplayMode = replayAudioCd; + else if (strlen(Name) > 7) { + int i, n; + for (i = 0, n = 0; Name[i]; ++i) { + if (Name[i] == ' ' && Name[i-1] == ',' && ++n == 4) + break; + } + if (Name[i]) { // replaying DVD + mReplayMode = replayDVD; + } } } } else { -- cgit v1.2.3