From 2f46fa32f13da3d500a3593e445c43f9a88ac54d Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Sat, 6 Jul 2024 18:31:17 +0600
Subject: [PATCH] chore: fix webview and app window freezing after successful
 login

---
 lib/main.dart                             | 10 ++++++----
 lib/pages/settings/sections/accounts.dart |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 45f4462d..7e8da0f2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -47,16 +47,18 @@ import 'package:timezone/data/latest.dart' as tz;
 import 'package:window_manager/window_manager.dart';
 
 Future<void> main(List<String> rawArgs) async {
+  if (rawArgs.contains("web_view_title_bar")) {
+    WidgetsFlutterBinding.ensureInitialized();
+    if (runWebViewTitleBarWidget(rawArgs)) {
+      return;
+    }
+  }
   final arguments = await startCLI(rawArgs);
   AppLogger.initialize(arguments["verbose"]);
 
   AppLogger.runZoned(() async {
     final widgetsBinding = WidgetsFlutterBinding.ensureInitialized();
 
-    if (runWebViewTitleBarWidget(rawArgs)) {
-      return;
-    }
-
     await registerWindowsScheme("spotify");
 
     tz.initializeTimeZones();
diff --git a/lib/pages/settings/sections/accounts.dart b/lib/pages/settings/sections/accounts.dart
index 596599be..7e37b68b 100644
--- a/lib/pages/settings/sections/accounts.dart
+++ b/lib/pages/settings/sections/accounts.dart
@@ -74,6 +74,7 @@ class SettingsAccountSection extends HookConsumerWidget {
                   "sp_dc=${cookies.firstWhere((element) => element.name.contains("sp_dc")).value.replaceAll("\u0000", "")}";
 
               await authNotifier.login(cookieHeader);
+
               webview.close();
               if (context.mounted) {
                 context.go("/");