1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-15 14:54:09 +02:00

Fixed some issues closing workspace while in comptime

This commit is contained in:
Brian Fiete 2025-02-15 15:03:55 -08:00
parent 856490755e
commit 6d3c660273

View file

@ -2516,9 +2516,16 @@ namespace IDE
{ {
if (mDebugger.mIsRunning) if (mDebugger.mIsRunning)
{ {
if (mDebugger.mIsComptimeDebug)
CancelBuild();
mDebugger.StopDebugging(); mDebugger.StopDebugging();
while (mDebugger.GetRunState() != .Terminated) while (mDebugger.GetRunState() != .Terminated)
{ {
if (mDebugger.mIsComptimeDebug)
{
if (!mBfBuildCompiler.IsPerformingBackgroundOperation())
break;
}
mDebugger.Update(); mDebugger.Update();
} }
mDebugger.mIsRunning = false; mDebugger.mIsRunning = false;
@ -2526,6 +2533,9 @@ namespace IDE
} }
mDebugger.DisposeNativeBreakpoints(); mDebugger.DisposeNativeBreakpoints();
mWantsRehupCallstack = false; mWantsRehupCallstack = false;
if (mDebugger.mIsComptimeDebug)
mDebugger.Detach();
} }
void CloseWorkspace() void CloseWorkspace()
@ -9644,6 +9654,8 @@ namespace IDE
if ((processCompileCmd.mHadBeef) && (mVerbosity >= .Normal)) if ((processCompileCmd.mHadBeef) && (mVerbosity >= .Normal))
OutputLine("Beef compilation time: {0:0.00}s", processCompileCmd.mStopwatch.ElapsedMilliseconds / 1000.0f); OutputLine("Beef compilation time: {0:0.00}s", processCompileCmd.mStopwatch.ElapsedMilliseconds / 1000.0f);
if (!mWorkspace.mCompileInstanceList.IsEmpty)
{
var compileInstance = mWorkspace.mCompileInstanceList.Back; var compileInstance = mWorkspace.mCompileInstanceList.Back;
compileInstance.mCompileResult = .Failure; compileInstance.mCompileResult = .Failure;
if (processCompileCmd.mBfPassInstance.mCompileSucceeded) if (processCompileCmd.mBfPassInstance.mCompileSucceeded)
@ -9668,6 +9680,7 @@ namespace IDE
if (compileInstance.mCompileResult == .Success) if (compileInstance.mCompileResult == .Success)
compileInstance.mCompileResult = .PendingHotLoad; compileInstance.mCompileResult = .PendingHotLoad;
} }
}
if (processCompileCmd.mProfileCmd != null) if (processCompileCmd.mProfileCmd != null)
{ {