Merge pull request #2580 from deathly809/bug/cancel_should_clear_focus

Ensure that we leave focus when we call stopAction or cancel working
This commit is contained in:
hydroflame 2022-01-15 18:15:50 -05:00 committed by GitHub
commit 37401f0917
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions

@ -735,6 +735,7 @@ export function NetscriptSingularity(
helper.checkSingularityAccess("stopAction");
if (player.isWorking) {
if (player.focus) {
player.stopFocusing();
Router.toTerminal();
}
const txt = player.singularityStopWork();

@ -729,6 +729,7 @@ export function finishWork(this: IPlayer, cancelled: boolean, sing = false): str
}
this.isWorking = false;
this.focus = false;
this.resetWorkStatus();
if (sing) {