diff --git a/lib/controllers/unified_push.dart b/lib/controllers/unified_push.dart index c4d923c..3edad02 100644 --- a/lib/controllers/unified_push.dart +++ b/lib/controllers/unified_push.dart @@ -3,7 +3,6 @@ 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"; @@ -78,7 +77,7 @@ class UnifiedPushController extends AsyncNotifier { KeyController.provider(KeyController.roomKey).future, ) == event.roomId)) { - if (isInBackground) SystemNavigator.pop(); + if (isInBackground) exit(0); return; } @@ -104,7 +103,7 @@ class UnifiedPushController extends AsyncNotifier { }, ); - if (isInBackground) SystemNavigator.pop(); + if (isInBackground) exit(0); }, onUnregistered: deregister, ); diff --git a/lib/main.dart b/lib/main.dart index 5ae33c2..8159396 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,6 @@ 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:material_emoji_picker/material_emoji_picker.dart"; import "package:media_kit/media_kit.dart"; @@ -80,7 +79,7 @@ void main(List args) async { .timeout(Duration(seconds: 5)); await Future.delayed(Duration(seconds: 10)); - SystemNavigator.pop(); + exit(0); } else { if (Platform.isLinux || Platform.isMacOS || Platform.isWindows) { await windowManager.ensureInitialized(); diff --git a/lib/widgets/appbar.dart b/lib/widgets/appbar.dart index c19d01d..33727ac 100644 --- a/lib/widgets/appbar.dart +++ b/lib/widgets/appbar.dart @@ -1,7 +1,6 @@ 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"; @@ -60,7 +59,7 @@ final class const Appbar({ ), IconButton( tooltip: "Close window", - onPressed: SystemNavigator.pop, + onPressed: () => exit(0), icon: const Icon(Icons.close), ), ],