From 74995862e6521bf8b9d16cc635771ff36de48158 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20=C3=85berg?= <anders@andersaberg.com>
Date: Tue, 7 Jan 2025 16:19:44 +0100
Subject: [PATCH] Moved reset to be in main / process launch

---
 apps/desktop/src/app/services/init.service.ts | 3 ---
 apps/desktop/src/main.ts                      | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts
index 5d480508d13..de80f95593a 100644
--- a/apps/desktop/src/app/services/init.service.ts
+++ b/apps/desktop/src/app/services/init.service.ts
@@ -21,7 +21,6 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { KeyService as KeyServiceAbstraction } from "@bitwarden/key-management";
 
 import { DesktopAutofillService } from "../../autofill/services/desktop-autofill.service";
-import { DesktopSettingsService } from "../../platform/services/desktop-settings.service";
 import { I18nRendererService } from "../../platform/services/i18n.renderer.service";
 import { SshAgentService } from "../../platform/services/ssh-agent.service";
 import { VersionService } from "../../platform/services/version.service";
@@ -48,7 +47,6 @@ export class InitService {
     private versionService: VersionService,
     private sshAgentService: SshAgentService,
     private autofillService: DesktopAutofillService,
-    private desktopSettingsService: DesktopSettingsService,
     @Inject(DOCUMENT) private document: Document,
   ) {}
 
@@ -81,7 +79,6 @@ export class InitService {
       const htmlEl = this.win.document.documentElement;
       htmlEl.classList.add("os_" + this.platformUtilsService.getDeviceString());
       this.themingService.applyThemeChangesTo(this.document);
-      await this.desktopSettingsService.resetInModalMode();
 
       this.versionService.init();
 
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index a4842249c93..c4ae8e1c103 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -272,6 +272,8 @@ export class Main {
     this.migrationRunner.run().then(
       async () => {
         await this.toggleHardwareAcceleration();
+        // Reset modal mode to make sure main window is displayed correctly
+        await this.desktopSettingsService.resetInModalMode();
         await this.windowMain.init();
         await this.i18nService.init();
         await this.messagingMain.init();