Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 29 additions & 15 deletions ZXBStudio/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1502,19 +1502,26 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven
}
else if (emulatorName.ToLower() == "cspect")
{
outLog.Writer.WriteLine("Launching CSpect...");
Process process = new Process();
process.StartInfo.FileName = emulatorPath;
process.StartInfo.Arguments = string.Format(
"-zxnext -tv -w3 -brk -r -mmc=\"{0}\" \"{1}\"",
nextDrive,
Path.Combine(nextDrive, Path.GetFileNameWithoutExtension(settings.MainFile) + ".nex"));
process.StartInfo.WorkingDirectory = project.ProjectPath;
process.StartInfo.UseShellExecute = true;
process.StartInfo.CreateNoWindow = false;
outLog.Writer.WriteLine(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
process.Start();
process.WaitForExit();
if (!File.Exists(emulatorPath))
{
errorMsg = "Emulator not found on: " + emulatorPath;
}
else
{
outLog.Writer.WriteLine("Launching CSpect...");
Process process = new Process();
process.StartInfo.FileName = emulatorPath;
process.StartInfo.Arguments = string.Format(
"-zxnext -tv -w3 -brk -r -mmc=\"{0}\" \"{1}\"",
nextDrive,
Path.Combine(nextDrive, Path.GetFileNameWithoutExtension(settings.MainFile) + ".nex"));
process.StartInfo.WorkingDirectory = project.ProjectPath;
process.StartInfo.UseShellExecute = false;
process.StartInfo.CreateNoWindow = false;
outLog.Writer.WriteLine(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
process.Start();
process.WaitForExit();
}
}
else if (emulatorName.ToLower() == "zesarux")
{
Expand All @@ -1526,7 +1533,7 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven
nextDrive,
Path.Combine(nextDrive, Path.GetFileNameWithoutExtension(settings.MainFile) + ".nex"));
process.StartInfo.WorkingDirectory = Path.GetDirectoryName(emulatorPath);
process.StartInfo.UseShellExecute = true;
process.StartInfo.UseShellExecute = false;
process.StartInfo.CreateNoWindow = false;
outLog.Writer.WriteLine(process.StartInfo.FileName + " " + process.StartInfo.Arguments);
process.Start();
Expand All @@ -1539,7 +1546,12 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven
}
catch (Exception ex)
{
errorMsg = "Error executing emulator";
errorMsg = "Error executing emulator: " + ex.Message + ex.StackTrace;
if (ex.InnerException != null)
{
var ex2= ex.InnerException;
errorMsg += "\r\nInner Exception: " + ex.Message + ex.StackTrace;
}
}
}

Expand Down Expand Up @@ -1625,6 +1637,8 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven
}
});
}


private async void BuildAndDebug(object? sender, Avalonia.Interactivity.RoutedEventArgs e)
{
if (string.IsNullOrWhiteSpace(ZXOptions.Current.ZxbcPath) || string.IsNullOrWhiteSpace(ZXOptions.Current.ZxbasmPath))
Expand Down
4 changes: 2 additions & 2 deletions ZXBStudio/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ namespace ZXBasicStudio
{
internal class Program
{
public static string Version = "1.6.0 - beta 6";
public static string VersionDate = "2025.10.09";
public static string Version = "1.6.0 - beta 6.3";
public static string VersionDate = "2025.11.16";


// Initialization code. Don't use any Avalonia, third-party APIs or any
Expand Down