X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2601ee77efe1f10be7cbeb8af94e2fb229cc1ec1..17b07b8ab4f698dfbef69fcf77b8f8d86c440f39:/lib/service/service.cpp

diff --git a/lib/service/service.cpp b/lib/service/service.cpp
index 150a0cd3..a490c3d7 100644
--- a/lib/service/service.cpp
+++ b/lib/service/service.cpp
@@ -7,8 +7,8 @@
 eServiceReference::eServiceReference(const std::string &string)
 {
 	const char *c=string.c_str();
-	int pathl=-1;
-	
+	int pathl=0;
+
 	if ( sscanf(c, "%d:%d:%x:%x:%x:%x:%x:%x:%x:%x:%n", &type, &flags, &data[0], &data[1], &data[2], &data[3], &data[4], &data[5], &data[6], &data[7], &pathl) < 8 )
 	{
 		memset( data, 0, sizeof(data) );
@@ -17,7 +17,19 @@ eServiceReference::eServiceReference(const std::string &string)
 	}
 
 	if (pathl)
-		path=c+pathl;
+	{
+		const char *pathstr = c+pathl;
+		const char *namestr = strchr(pathstr, ':');
+		if (namestr)
+		{
+			if (pathstr != namestr)
+				path.assign(pathstr, namestr-pathstr);
+			if (*(namestr+1))
+				name=namestr+1;
+		}
+		else
+			path=pathstr;
+	}
 }
 
 std::string eServiceReference::toString() const
@@ -27,10 +39,10 @@ std::string eServiceReference::toString() const
 	ret += ":";
 	ret += getNum(flags);
 	for (unsigned int i=0; i<sizeof(data)/sizeof(*data); ++i)
-	{
 		ret+=":"+ getNum(data[i], 0x10);
-	}
 	ret+=":"+path;
+	if (name.length())
+		ret+=":"+name;
 	return ret;
 }