Skip to content

[PM-41905] Add Autotype MVP Window Null Check #22398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
coltonhurst wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −5
Open

[PM-41905] Add Autotype MVP Window Null Check #22398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 16 additions & 0 deletions apps/desktop/src/autofill/main/main-desktop-autotype-mvp.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,5 +414,21 @@ describe("MainDesktopAutotypeMvpService", () => {
{ windowTitle: "Notepad" },
);
});

it("should not throw on shortcut activation if the window does not exist", () => {
const toggleHandler = ipcHandlers.get(AUTOTYPE_MVP_IPC_CHANNELS.TOGGLE);
toggleHandler({}, true);

mockWindowMain.win = null;

// Get the registered callback
const registeredCallback = (globalShortcut.register as jest.Mock).mock.calls[0][1];

expect(() => registeredCallback()).not.toThrow();
expect(autotype_mvp.getForegroundWindowTitle).not.toHaveBeenCalled();
expect(mockLogService.debug).toHaveBeenCalledWith(
"Autotype keyboard shortcut activated, but the main window does not exist.",
);
});
});
});
16 changes: 11 additions & 5 deletions apps/desktop/src/autofill/main/main-desktop-autotype-mvp.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,17 @@ export class MainDesktopAutotypeMvpService {
const result = globalShortcut.register(
this.autotypeKeyboardShortcut.getElectronFormat(),
() => {
const windowTitle = autotype_mvp.getForegroundWindowTitle();

this.windowMain.win.webContents.send(AUTOTYPE_MVP_IPC_CHANNELS.LISTEN, {
windowTitle,
});
if (this.windowMain.win != null) {

@claude claude Bot Aug 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎨 SUGGESTED: Also guard on isDestroyed() to close the remaining shutdown race.

Details and fix

WindowMain only clears this.win inside the closed handler after an await:

// window.main.ts:474
this.win.on("closed", async () => {
  this.isClosing = false;
  await this.updateWindowState(mainWindowSizeKey, this.win); // <- yields
  this.win = null;
});

During that await the window is destroyed but win is still non-null, so a shortcut press in that gap reaches this.windowMain.win.webContents.send(...) and throws Object has been destroyed — the exact crash this PR is closing.

Suggested change
if (this.windowMain.win != null) {
if (this.windowMain.win != null && !this.windowMain.win.isDestroyed()) {

This matches the existing pattern used elsewhere in the desktop main process (window.main.ts:335 and window.main.ts:592).

const windowTitle = autotype_mvp.getForegroundWindowTitle();

this.windowMain.win.webContents.send(AUTOTYPE_MVP_IPC_CHANNELS.LISTEN, {
windowTitle,
});
} else {
this.logService.debug(
"Autotype keyboard shortcut activated, but the main window does not exist.",
);
}
},
);

Expand Down
Loading