From 945f0d4051fbf1a04b1ee524cd5e9e980693e4d2 Mon Sep 17 00:00:00 2001
From: Naveax <Omersevik095@gmail.com>
Date: Sat, 29 Aug 2026 00:23:33 +0300
Subject: [PATCH] fix: preserve navigator before closing sidebar

---
 lib/components/sidebar_drawer.dart | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/components/sidebar_drawer.dart b/lib/components/sidebar_drawer.dart
index e305d22..1fb23b9 100644
--- a/lib/components/sidebar_drawer.dart
+++ b/lib/components/sidebar_drawer.dart
@@ -126,8 +126,11 @@ class _SidebarDrawerState extends State<SidebarDrawer> {
               icon: Icons.settings,
               label: 'Settings',
               onTap: () {
-                Navigator.of(context).pop();
-                SettingsButton.open(context);
+                final drawerNavigator = Navigator.of(context);
+                final rootNavigator =
+                    Navigator.of(context, rootNavigator: true);
+                drawerNavigator.pop();
+                SettingsButton.openWithNavigator(rootNavigator);
               },
             ),
 
@@ -135,8 +138,15 @@ class _SidebarDrawerState extends State<SidebarDrawer> {
               icon: Icons.system_update_alt,
               label: 'Check for updates',
               onTap: () {
-                Navigator.of(context).pop();
-                Updater.check(context);
+                final drawerNavigator = Navigator.of(context);
+                final rootNavigator =
+                    Navigator.of(context, rootNavigator: true);
+                final messenger = ScaffoldMessenger.of(context);
+                drawerNavigator.pop();
+                Updater.checkWithHandles(
+                  navigator: rootNavigator,
+                  messenger: messenger,
+                );
               },
             ),