diff options
author | pius.lee <pius.lee@samsung.com> | 2016-10-17 19:51:57 +0900 |
---|---|---|
committer | pius.lee <pius.lee@samsung.com> | 2016-10-17 19:52:22 +0900 |
commit | 612bbc37fd9547ddd78e190ba2b0c51fb52ca1f3 (patch) | |
tree | 5180fba1d67198b70fbf6eecc1655ed0c2a920c8 | |
parent | 4e5f06ed0b3c8a7d3029af02c847b6a36c92d806 (diff) | |
download | launcher-612bbc37fd9547ddd78e190ba2b0c51fb52ca1f3.tar.gz launcher-612bbc37fd9547ddd78e190ba2b0c51fb52ca1f3.tar.bz2 launcher-612bbc37fd9547ddd78e190ba2b0c51fb52ca1f3.zip |
Fix missed 0 args on standalone
Add argv[0] to args on standalone.
Fix Console.WriteLine to Dlog debug print out.
Change-Id: Iffc0eed1d0c7a9a538c12f9693b68e58011bea41
-rw-r--r-- | NativeLauncher/src/main.cc | 10 | ||||
-rw-r--r-- | Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyManager.cs | 2 | ||||
-rw-r--r-- | Tizen.Runtime/Tizen.Runtime.Mono/AssemblyManager.cs | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/NativeLauncher/src/main.cc b/NativeLauncher/src/main.cc index 248de99..9f43bfc 100644 --- a/NativeLauncher/src/main.cc +++ b/NativeLauncher/src/main.cc @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) std::vector<char*> vargs; - for (i=1; i<argc; i++) + for (i=0; i<argc; i++) { if (VersionOption.compare(argv[i]) == 0) { @@ -88,9 +88,13 @@ int main(int argc, char *argv[]) std::string approot; if (appid != nullptr) { - approot = std::string(aul_get_app_root_path()); + const char* approot_path = aul_get_app_root_path(); + if (approot_path != nullptr) + { + approot = std::string(approot_path); + } } - else + if (approot.empty()) { approot = Basename(standalonePath); } diff --git a/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyManager.cs b/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyManager.cs index ec342d5..39ff2fa 100644 --- a/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyManager.cs +++ b/Tizen.Runtime/Tizen.Runtime.Coreclr/AssemblyManager.cs @@ -86,7 +86,7 @@ namespace Tizen.Runtime.Coreclr if (!string.IsNullOrEmpty(preloadDirectory)) { - Console.WriteLine($"[{preloadDirectory}]"); + ALog.Debug($"Load from [{preloadDirectory}]"); DirectoryInfo d = new DirectoryInfo(preloadDirectory); if (Directory.Exists(d.FullName)) { diff --git a/Tizen.Runtime/Tizen.Runtime.Mono/AssemblyManager.cs b/Tizen.Runtime/Tizen.Runtime.Mono/AssemblyManager.cs index ec65ca6..9389c62 100644 --- a/Tizen.Runtime/Tizen.Runtime.Mono/AssemblyManager.cs +++ b/Tizen.Runtime/Tizen.Runtime.Mono/AssemblyManager.cs @@ -112,7 +112,7 @@ namespace Tizen.Runtime.Mono { if (!string.IsNullOrEmpty(preloadDirectory)) { - Console.WriteLine($"[{preloadDirectory}]"); + ALog.Debug($"Load from [{preloadDirectory}]"); DirectoryInfo d = new DirectoryInfo(preloadDirectory); if (Directory.Exists(d.FullName)) { |