From a86748e85fbd071d8831166dfcc19918faba8682 Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Sat, 3 Oct 2026 01:01:59 -0400
Subject: [PATCH] swap to SystemNavigator.pop from exit

---
 lib/controllers/unified_push.dart | 5 +++--
 lib/main.dart                     | 3 ++-
 lib/widgets/appbar.dart           | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart
index cc0fce0..6b1538d 100644
--- a/lib/controllers/unified_push.dart
+++ b/lib/controllers/unified_push.dart
@@ -3,6 +3,7 @@ import "dart:convert";
 import "dart:io";
 
 import "package:flutter/foundation.dart";
+import "package:flutter/services.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:intl/intl.dart";
 import "package:nexus/controllers/key.dart";
@@ -73,7 +74,7 @@ class UnifiedPushController extends AsyncNotifier<bool> {
                       KeyController.provider(KeyController.roomKey).future,
                     ) ==
                     event.roomId)) {
-          if (isInBackground) exit(0);
+          if (isInBackground) SystemNavigator.pop();
           return;
         }
 
@@ -99,7 +100,7 @@ class UnifiedPushController extends AsyncNotifier<bool> {
               },
             );
 
-        if (isInBackground) exit(0);
+        if (isInBackground) SystemNavigator.pop();
       },
       onUnregistered: deregister,
     );
diff --git a/lib/main.dart b/lib/main.dart
index 5586cbf..de59cd5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -2,6 +2,7 @@ import "dart:io";
 
 import "package:dynamic_color/dynamic_color.dart";
 import "package:flutter/foundation.dart";
+import "package:flutter/services.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 import "package:media_kit/media_kit.dart";
 import "package:nexus/controllers/client_state.dart";
@@ -78,7 +79,7 @@ void main(List<String> args) async {
         .timeout(Duration(seconds: 5));
 
     await Future.delayed(Duration(seconds: 10));
-    exit(0);
+    SystemNavigator.pop();
   } else {
     if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) {
       await windowManager.ensureInitialized();
diff --git a/lib/widgets/appbar.dart b/lib/widgets/appbar.dart
index 33727ac..c19d01d 100644
--- a/lib/widgets/appbar.dart
+++ b/lib/widgets/appbar.dart
@@ -1,6 +1,7 @@
 import "dart:io";
 
 import "package:fast_immutable_collections/fast_immutable_collections.dart";
+import "package:flutter/services.dart";
 import "package:material_ui/material_ui.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:nexus/controllers/settings.dart";
@@ -59,7 +60,7 @@ final class const Appbar({
               ),
             IconButton(
               tooltip: "Close window",
-              onPressed: () => exit(0),
+              onPressed: SystemNavigator.pop,
               icon: const Icon(Icons.close),
             ),
           ],