From f7bc5be8e455e80df21035d807ed4f6f764d539d Mon Sep 17 00:00:00 2001
From: Mark Sinclair <mmsinclair@users.noreply.github.com>
Date: Fri, 5 May 2023 12:12:08 +0100
Subject: [PATCH] Bug fix: resolve dead-lock when switching signin to main app
 window in the Nym Wallet

- change operations to async
- open the new window first and then try to close the old window, to prevent the process from exiting
---
 .../src-tauri/src/operations/app/window.rs    | 39 ++++++++++---------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/nym-wallet/src-tauri/src/operations/app/window.rs b/nym-wallet/src-tauri/src/operations/app/window.rs
index 72bcfb07e2..ce30536fe0 100644
--- a/nym-wallet/src-tauri/src/operations/app/window.rs
+++ b/nym-wallet/src-tauri/src/operations/app/window.rs
@@ -3,38 +3,28 @@ use tauri::Manager;
 use crate::error::BackendError;
 
 #[tauri::command]
-pub fn create_main_window(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
+pub async fn create_main_window(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
     // first, try close the sign up/sign in (`main` => `index.html`)
     // then, create the main app window (`nymWalletApp` => `main.html`)
     // see `webpack.common.js` for the `.tsx` file associated with the bundled output entry point used in `new_window_url`
-    create_window(app_handle, "nymWalletApp", "main.html", "main")
+    create_window(app_handle, "nymWalletApp", "main.html", "main").await
 }
 
 #[tauri::command]
-pub fn create_auth_window(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
+pub async fn create_auth_window(app_handle: tauri::AppHandle) -> Result<(), BackendError> {
     // first, try close the main app window (`nymWalletApp` => `main.html`)
     // then, create the sign up/sign in (`main` => `index.html`) so the user can log in again
     // see `webpack.common.js` for the `.tsx` file associated with the bundled output entry point used in `new_window_url`
-    create_window(app_handle, "main", "index.html", "nymWalletApp")
+    create_window(app_handle, "main", "index.html", "nymWalletApp").await
 }
 
-fn create_window(
+async fn create_window(
     app_handle: tauri::AppHandle,
     new_window_label: &str,
     new_window_url: &str,
     try_close_window_label: &str,
 ) -> Result<(), BackendError> {
-    match app_handle.windows().get(try_close_window_label) {
-        Some(try_close_window) => {
-            if let Err(err) = try_close_window.close() {
-                log::error!("Could not close window: {err}")
-            }
-        }
-        None => {
-            log::error!("Unable to close window `{try_close_window_label}`")
-        }
-    }
-
+    // create the new window first, to stop the app process from exiting
     log::info!("Creating {} window...", new_window_label);
     match tauri::WindowBuilder::new(
         &app_handle,
@@ -51,11 +41,24 @@ fn create_window(
             if let Err(err) = window.maximize() {
                 log::error!("Could not maximize window: {err}");
             }
-            Ok(())
         }
         Err(err) => {
             log::error!("Unable to create log window: {err}");
-            Err(BackendError::NewWindowError)
+            return Err(BackendError::NewWindowError);
         }
     }
+
+    // close the old window
+    match app_handle.windows().get(try_close_window_label) {
+        Some(try_close_window) => {
+            if let Err(err) = try_close_window.close() {
+                log::error!("Could not close window: {err}")
+            }
+        }
+        None => {
+            log::error!("Unable to close window `{try_close_window_label}`")
+        }
+    }
+
+    Ok(())
 }