From 316f61394da6759e4ba79043baa939ecaec6c0f5 Mon Sep 17 00:00:00 2001
From: nyne <me@nyne.dev>
Date: Tue, 4 Mar 2025 22:17:21 +0800
Subject: [PATCH] Try to fix #241

---
 lib/pages/reader/reader.dart | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/pages/reader/reader.dart b/lib/pages/reader/reader.dart
index d1aef65..057e78b 100644
--- a/lib/pages/reader/reader.dart
+++ b/lib/pages/reader/reader.dart
@@ -503,10 +503,13 @@ mixin class _ReaderWindow {
 
   late WindowFrameController windowFrame;
 
+  bool _isInit = false;
+
   void initReaderWindow() {
-    if (!App.isDesktop) return;
+    if (!App.isDesktop || _isInit) return;
     windowFrame = WindowFrame.of(App.rootContext);
     windowFrame.addCloseListener(onWindowClose);
+    _isInit = true;
   }
 
   void fullscreen() async {
@@ -519,8 +522,12 @@ mixin class _ReaderWindow {
   }
 
   bool onWindowClose() {
-    App.rootContext.pop();
-    return false;
+    if (Navigator.of(App.rootContext).canPop()) {
+      Navigator.of(App.rootContext).pop();
+      return false;
+    } else {
+      return true;
+    }
   }
 
   void disposeReaderWindow() {