Commit status_c.diff (thx gda)

2 files changed, 21 insertions, 18 deletions

diff --git a/HISTORY b/HISTORY
index 1409166..1a4a2f0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -9,6 +9,7 @@ VDR Plugin 'text2skin' Revision History
 - Commit t2s_rerunandtab.diff by tomas@vdr-portal.de
   http://www.vdr-portal.de/board17-developer/board25-patches/p914968-patch-f%C3%BCr-text2skin-channelnames4reruns/#post914968
 - Commit common_c.diff most probably by Christian Winninger (unknown source)
+- Commit status_c.diff most probably by Gerald Dachs (unknown source)
 
 2011-11-06: Version 1.3.2
 
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 {