X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=NativeLauncher%2Futil%2Fpath_manager.cc;h=99446edc08bd8f5b2d92af55e61c619528f61c60;hb=97d13822a6b55b5b1418df892811b5795f6ee5c3;hp=cc42e88a8a5a2460da3642f9ee913c80f2323f13;hpb=d30d10e3a78ba764d298939859415001d697aa38;p=platform%2Fcore%2Fdotnet%2Flauncher.git

diff --git a/NativeLauncher/util/path_manager.cc b/NativeLauncher/util/path_manager.cc
index cc42e88..99446ed 100644
--- a/NativeLauncher/util/path_manager.cc
+++ b/NativeLauncher/util/path_manager.cc
@@ -75,11 +75,9 @@ int initializePathManager(const std::string& runtimeDir, const std::string& tize
 	if (!extraDir.empty()) {
 		splitPath(extraDir, __dllPath->extra_dirs);
 	} else {
-		if (pluginGetDllPath()) {
-			std::string pluginPath(pluginGetDllPath());
-			if (!pluginPath.empty()) {
-				splitPath(pluginPath, __dllPath->extra_dirs);
-			}
+		char* extraPath = pluginGetDllPath();
+		if (extraPath) {
+			splitPath(extraPath, __dllPath->extra_dirs);
 		}
 	}
 
@@ -129,7 +127,7 @@ std::string getTPA()
 	tpaDir.push_back(getRuntimeDir());
 	tpaDir.push_back(getTizenFXDir());
 	tpaDir.push_back(getTizenFXRefDir());
-	tpaDir.insert(tpaDir.end(), getExtraDirs().begin(), getExtraDirs().end());
+	tpaDir.insert(tpaDir.end(), __dllPath->extra_dirs.begin(), __dllPath->extra_dirs.end());
 	assembliesInDirectory(tpaDir, __tpa);
 
 	return __tpa;