Merge pull request #208 from vosen/master

Fix #202 and #205
PistonDevelopers · Mar 6, 2016 · 611a605 · 611a605
2 parents e1ceb2c + 7581c62
commit 611a605
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/VisualRust.Project/Launcher/GnuDebugLauncher.cs b/VisualRust.Project/Launcher/GnuDebugLauncher.cs
@@ -144,7 +144,7 @@ string GetExtraArguments()
 
         string[] GetScriptLines()
         {
-            string debuggerScript = env.GetDebugConfigurationProperty<string>("DebuggerScript");
+            string debuggerScript = env.DebugConfig.DebuggerScript;
             if(String.IsNullOrEmpty(debuggerScript))
                 return new string[0];
             return debuggerScript.Split(new [] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);

diff --git a/VisualRust.Project/Launcher/LauncherEnviroment.cs b/VisualRust.Project/Launcher/LauncherEnviroment.cs
@@ -15,13 +15,13 @@ namespace VisualRust.Project.Launcher
     class LauncherEnvironment
     {
         readonly RustProjectNode project;
-        readonly Configuration.Debug debugConfig;
         readonly RustProjectConfig projectConfig;
+        public Configuration.Debug DebugConfig { get; private set; }
 
         public LauncherEnvironment(RustProjectNode project, Configuration.Debug debugConfig, RustProjectConfig  projConfig)
         {
             this.project = project;
-            this.debugConfig = debugConfig;
+            this.DebugConfig = debugConfig;
             this.projectConfig = projConfig;
         }
 

diff --git a/VisualRust.Project/RustProjectLauncher.cs b/VisualRust.Project/RustProjectLauncher.cs
@@ -70,7 +70,7 @@ private IRustProjectLauncher ChooseLauncher(bool debug)
             if(!debug)
                 return new ReleaseLauncher(environment);
             TargetTriple triple = environment.GetTargetTriple();
-            if(triple.Abi == "msvc")
+            if(triple != null && triple.Abi == "msvc")
                 return new MsvcDebugLauncher(environment);
             else
                 return new GnuDebugLauncher(environment, triple);