Merge branch '10-support-builtin-additional-settings'

* 10-support-builtin-additional-settings: Environment can be displayed without having a valid application path
commontk · Dec 3, 2012 · c2ded81 · c2ded81
2 parents d4a540c + f3509ce
commit c2ded81
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Base/ctkAppLauncher.cpp b/Base/ctkAppLauncher.cpp
@@ -978,17 +978,17 @@ int ctkAppLauncher::processArguments()
     return Self::ExitWithError;
     }
 
-  if (!this->Internal->processApplicationToLaunchArgument())
-    {
-    return Self::ExitWithError;
-    }
-
   if (this->Internal->ParsedArgs.value("launcher-dump-environment").toBool())
     {
     this->displayEnvironment();
     return Self::ExitWithSuccess;
     }
 
+  if (!this->Internal->processApplicationToLaunchArgument())
+    {
+    return Self::ExitWithError;
+    }
+
   return Self::Continue;
 }
 

diff --git a/Testing/CMake/AppLauncher-Param-TestLauncherDumpEnvironment.cmake b/Testing/CMake/AppLauncher-Param-TestLauncherDumpEnvironment.cmake
@@ -17,7 +17,7 @@ set(env_var_name_2 "SOMETHING_AWESOME")
 set(env_var_value_2 "Rock climbing !")
 file(WRITE "${launcher}LauncherSettings.ini" "
 [Application]
-path=${application}
+path=
 
 [LibraryPaths]
 1\\path=${library_path}