Merge branch 'master' into android

[android-sdk/arm-ds5-gator.git] / daemon / StreamlineSetup.cpp

diff --git a/daemon/StreamlineSetup.cpp b/daemon/StreamlineSetup.cpp
index e196a7dba2c993151eff4328d06398ab23b07732..2faada23f842094e7fc1cfeab7d3868529963abb 100644 (file)
--- a/daemon/StreamlineSetup.cpp
+++ b/daemon/StreamlineSetup.cpp
@@ -255,12 +255,7 @@ void StreamlineSetup::sendCounters() {
 void StreamlineSetup::writeConfiguration(char* xml) {
        char path[PATH_MAX];
 
-       if (gSessionData->mConfigurationXMLPath) {
-               strncpy(path, gSessionData->mConfigurationXMLPath, PATH_MAX);
-       } else {
-               util->getApplicationFullPath(path, PATH_MAX);
-               strncat(path, "configuration.xml", PATH_MAX - strlen(path) - 1);
-       }
+       ConfigurationXML::getPath(path);
 
        if (util->writeToDisk(path, xml) < 0) {
                logg->logError(__FILE__, __LINE__, "Error writing %s\nPlease verify write permissions to this path.", path);