Skip to content

Commit 611a605

Browse files
committed
Merge pull request #208 from vosen/master
Fix #202 and #205
2 parents e1ceb2c + 7581c62 commit 611a605

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

VisualRust.Project/Launcher/GnuDebugLauncher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ string GetExtraArguments()
144144

145145
string[] GetScriptLines()
146146
{
147-
string debuggerScript = env.GetDebugConfigurationProperty<string>("DebuggerScript");
147+
string debuggerScript = env.DebugConfig.DebuggerScript;
148148
if(String.IsNullOrEmpty(debuggerScript))
149149
return new string[0];
150150
return debuggerScript.Split(new [] { "\r\n", "\n" }, StringSplitOptions.RemoveEmptyEntries);

VisualRust.Project/Launcher/LauncherEnviroment.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ namespace VisualRust.Project.Launcher
1515
class LauncherEnvironment
1616
{
1717
readonly RustProjectNode project;
18-
readonly Configuration.Debug debugConfig;
1918
readonly RustProjectConfig projectConfig;
19+
public Configuration.Debug DebugConfig { get; private set; }
2020

2121
public LauncherEnvironment(RustProjectNode project, Configuration.Debug debugConfig, RustProjectConfig projConfig)
2222
{
2323
this.project = project;
24-
this.debugConfig = debugConfig;
24+
this.DebugConfig = debugConfig;
2525
this.projectConfig = projConfig;
2626
}
2727

VisualRust.Project/RustProjectLauncher.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private IRustProjectLauncher ChooseLauncher(bool debug)
7070
if(!debug)
7171
return new ReleaseLauncher(environment);
7272
TargetTriple triple = environment.GetTargetTriple();
73-
if(triple.Abi == "msvc")
73+
if(triple != null && triple.Abi == "msvc")
7474
return new MsvcDebugLauncher(environment);
7575
else
7676
return new GnuDebugLauncher(environment, triple);

0 commit comments

Comments
 (0)