Skip to content

Commit 3560b93

Browse files
authored
fix: Object has destroyed message (#2273)
1 parent c924fe2 commit 3560b93

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/ui/main/rootWindow.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ const fetchRootWindowState = async (): Promise<
148148
visible: browserWindow.isVisible(),
149149
maximized: browserWindow.isMaximized(),
150150
minimized: browserWindow.isMinimized(),
151-
fullscreen: browserWindow.isFullScreen(),
151+
fullscreen: false, // browserWindow.isFullScreen(),
152152
normal: browserWindow.isNormal(),
153153
bounds: browserWindow.getNormalBounds(),
154154
};
@@ -236,13 +236,13 @@ export const setupRootWindow = (): void => {
236236
rootWindow.flashFrame(false);
237237
});
238238

239-
rootWindow.addListener('close', async () => {
240-
if (rootWindow.isFullScreen()) {
241-
await new Promise((resolve) =>
242-
rootWindow.once('leave-full-screen', resolve)
243-
);
244-
rootWindow.setFullScreen(false);
245-
}
239+
rootWindow.addListener('close', () => {
240+
// if (rootWindow.isFullScreen()) {
241+
// await new Promise((resolve) =>
242+
// rootWindow.once('leave-full-screen', resolve)
243+
// );
244+
// rootWindow.setFullScreen(false);
245+
// }
246246

247247
rootWindow.blur();
248248

src/ui/main/serverView/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ export const attachGuestWebContentsEvents = async (): Promise<void> => {
161161
delete webPreferences.enableBlinkFeatures;
162162
webPreferences.preload = path.join(app.getAppPath(), 'app/preload.js');
163163
webPreferences.nodeIntegration = false;
164-
webPreferences.nodeIntegrationInWorker = true;
165-
webPreferences.nodeIntegrationInSubFrames = true;
164+
webPreferences.nodeIntegrationInWorker = false;
165+
webPreferences.nodeIntegrationInSubFrames = false;
166166
webPreferences.webSecurity = true;
167167
webPreferences.contextIsolation = true;
168168
webPreferences.nativeWindowOpen = true;

0 commit comments

Comments
 (0)