--- liblscp/trunk/src/client.c	2004/07/06 16:24:41	179
+++ liblscp/trunk/src/client.c	2004/07/06 20:20:51	180
@@ -887,12 +887,12 @@
             if (strcasecmp(pszToken, "DESCRIPTION") == 0) {
                 pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
                 if (pszToken)
-                    pEngineInfo->description = lscp_unquote(&pszToken, 1);
+                    lscp_unquote_dup(&(pEngineInfo->description), &pszToken);
             }
             else if (strcasecmp(pszToken, "VERSION") == 0) {
                 pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
                 if (pszToken)
-                    pEngineInfo->version = lscp_unquote(&pszToken, 1);
+                    lscp_unquote_dup(&(pEngineInfo->version), &pszToken);
             }
             pszToken = lscp_strtok(NULL, pszSeps, &(pch));
         }
@@ -943,7 +943,7 @@
             if (strcasecmp(pszToken, "ENGINE_NAME") == 0) {
                 pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
                 if (pszToken)
-                    pChannelInfo->engine_name = lscp_unquote(&pszToken, 1);
+                    lscp_unquote_dup(&(pChannelInfo->engine_name), &pszToken);
             }
             else if (strcasecmp(pszToken, "AUDIO_OUTPUT_DEVICE") == 0) {
                 pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
@@ -957,13 +957,16 @@
             }
             else if (strcasecmp(pszToken, "AUDIO_OUTPUT_ROUTING") == 0) {
                 pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
-                if (pszToken)
+                if (pszToken) {
+                    if (pChannelInfo->audio_routing)
+                        lscp_szsplit_destroy(pChannelInfo->audio_routing);
                     pChannelInfo->audio_routing = lscp_szsplit_create(pszToken, ",");
+                }
             }
             else if (strcasecmp(pszToken, "INSTRUMENT_FILE") == 0) {
                 pszToken = lscp_strtok(NULL, pszCrlf, &(pch));
                 if (pszToken)
-                    pChannelInfo->instrument_file = lscp_unquote(&pszToken, 1);
+                    lscp_unquote_dup(&(pChannelInfo->instrument_file), &pszToken);
             }
             else if (strcasecmp(pszToken, "INSTRUMENT_NR") == 0) {
                 pszToken = lscp_strtok(NULL, pszCrlf, &(pch));