From 79f8727c69020ff4b93e46f66f3de1f5e21e3f69 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Fri, 30 Jun 2023 14:01:12 +0800
Subject: [PATCH] move super.dispose ahead in async dispose

---
 flutter/lib/desktop/pages/remote_page.dart | 3 ++-
 flutter/lib/mobile/pages/remote_page.dart  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart
index b26329a7d..849971a41 100644
--- a/flutter/lib/desktop/pages/remote_page.dart
+++ b/flutter/lib/desktop/pages/remote_page.dart
@@ -206,6 +206,8 @@ class _RemotePageState extends State<RemotePage>
 
   @override
   Future<void> dispose() async {
+    // https://github.com/flutter/flutter/issues/64935
+    super.dispose();
     debugPrint("REMOTE PAGE dispose ${widget.id}");
     if (useTextureRender) {
       platformFFI.registerTexture(sessionId, 0);
@@ -229,7 +231,6 @@ class _RemotePageState extends State<RemotePage>
     }
     await Get.delete<FFI>(tag: widget.id);
     removeSharedStates(widget.id);
-    super.dispose();
   }
 
   Widget buildBody(BuildContext context) {
diff --git a/flutter/lib/mobile/pages/remote_page.dart b/flutter/lib/mobile/pages/remote_page.dart
index 156d6190c..028fa2ed9 100644
--- a/flutter/lib/mobile/pages/remote_page.dart
+++ b/flutter/lib/mobile/pages/remote_page.dart
@@ -76,6 +76,8 @@ class _RemotePageState extends State<RemotePage> {
 
   @override
   Future<void> dispose() async {
+    // https://github.com/flutter/flutter/issues/64935
+    super.dispose();
     gFFI.dialogManager.hideMobileActionsOverlay();
     gFFI.inputModel.listenToMouse(false);
     await gFFI.invokeMethod("enable_soft_keyboard", true);
@@ -89,7 +91,6 @@ class _RemotePageState extends State<RemotePage> {
     await Wakelock.disable();
     await keyboardSubscription.cancel();
     removeSharedStates(widget.id);
-    super.dispose();
   }
 
   void onSoftKeyboardChanged(bool visible) {