From 8283d09b5b9505e0c7833039bba234e6110cda75 Mon Sep 17 00:00:00 2001
From: binarybaron <86064887+binarybaron@users.noreply.github.com>
Date: Thu, 7 Nov 2024 21:11:46 +0100
Subject: [PATCH] fix(gui): Relaunch application after updater installation has
 finished (#137)

---
 .../renderer/components/modal/updater/UpdaterDialog.tsx    | 6 +++---
 src-tauri/src/lib.rs                                       | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src-gui/src/renderer/components/modal/updater/UpdaterDialog.tsx b/src-gui/src/renderer/components/modal/updater/UpdaterDialog.tsx
index 58d6ffe1..58c5628d 100644
--- a/src-gui/src/renderer/components/modal/updater/UpdaterDialog.tsx
+++ b/src-gui/src/renderer/components/modal/updater/UpdaterDialog.tsx
@@ -87,11 +87,11 @@ export default function UpdaterDialog() {
             ...prev,
             downloadedBytes: prev.downloadedBytes + event.data.chunkLength,
           }));
-        } else if (event.event === 'Finished') {
-            // Relaunch the application for the new version to be used
-          relaunch();
         }
       });
+
+      // Once the promise resolves, relaunch the application for the new version to be used
+      relaunch();
     } catch (err) {
         enqueueSnackbar(`Failed to install update: ${err}`, {
             variant: "error"
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
index fb35bdcc..d62866f0 100644
--- a/src-tauri/src/lib.rs
+++ b/src-tauri/src/lib.rs
@@ -131,9 +131,10 @@ pub fn run() {
     #[cfg(desktop)]
     {
         builder = builder.plugin(tauri_plugin_single_instance::init(|app, _, _| {
-            let _ = app.get_webview_window("main")
-                       .expect("no main window")
-                       .set_focus();
+            let _ = app
+                .get_webview_window("main")
+                .expect("no main window")
+                .set_focus();
         }));
     }