Cleanup and give exit option in error dialog

Author: wyrdough

src/components/LoadingScreen/index.tsx

@@ -16,6 +16,7 @@ import { OfflineDialog } from "@app/dialogs/Dialogs/OfflineDialog";
 import { remove } from "@tauri-apps/plugin-fs";
 import { appConfigDir, join } from "@tauri-apps/api/path";
 import CheckForUpdates from "@app/components/Updater";
+import {exit} from "@tauri-apps/plugin-process";
 
 const appWindow = getCurrentWebviewWindow();
 
@@ -94,17 +95,26 @@ const LoadingScreen: React.FC<Props> = (props: Props) => {
                 if (directories.downloadLocationInvalid) {
                     do {
                         result = await showErrorDialog("The download location is invalid. This is likely because your download location is on a removable drive or the launcher does not have permission to write to it. If you are using a removable drive, please plug it in and click retry. Otherwise, click Okay to restart the onboarding process.",
-                            true);
+                            true, true);
 
                         if (result == "retry") {
                             await directories.setDirs(downloadLocation);
                             directories = useDirectories.getState();
                         }
-                    } while (result === "retry");
+
+                        if (result == "close") {
+                            await exit();
+                        }
+                    } while (result === "retry" && directories.downloadLocationInvalid);
 
                     // User gave up retrying and download location is still invalid, so restart onboarding
                     if (directories.downloadLocationInvalid) {
-                        await showErrorDialog("Due to an invalid download location the launcher will be reinitialized. Once you click Okay all settings will be lost and you will restart the onboarding process. If your launcher was previously working and you want to attempt recovery, do not click Okay and instead close the launcher.");
+                        result = await showErrorDialog("Due to an invalid download location the launcher will be reinitialized. Once you click Okay all settings will be lost and you will restart the onboarding process. If you want to attempt recovery, do not click Okay and instead close the launcher.\nLast Error: " + directories.lastError,
+                            false, true);
+
+                        if (result == "close") {
+                            await exit();
+                        }
 
                         try {
                             await remove(await join(await appConfigDir(), "settings.json"));

src/dialogs/Dialogs/ErrorDialog.tsx

@@ -49,6 +49,9 @@ export class ErrorDialog extends BaseDialog<Record<string, never>> {
             { this.props.showRetry &&
                 <Button color={ButtonColor.GREEN} rounded onClick={() => closeDialog("retry")}>Retry</Button>
             }
+            { this.props.showClose &&
+                <Button color={ButtonColor.RED} rounded onClick={() => closeDialog("close")}>Close</Button>
+            }
         </>;
     }
 }

src/dialogs/index.ts

@@ -52,6 +52,6 @@ export const setDialogOpen = (open: boolean) => {
 };
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function showErrorDialog(error: any, showRetry = false): Promise<string | undefined> {
-    return await createAndShowDialog(ErrorDialog, { error, showRetry });
+export async function showErrorDialog(error: any, showRetry = false, showClose = false): Promise<string | undefined> {
+    return await createAndShowDialog(ErrorDialog, { error, showRetry, showClose });
 }

src/main.tsx

@@ -1,4 +1,4 @@
-import React, {useEffect, useState} from "react";
+import React, {useState} from "react";
 import ReactDOM from "react-dom/client";
 import "./styles.css";
 import TitleBar from "./components/TitleBar";

src/profiles/directories.ts

@@ -18,6 +18,7 @@ export interface DirectoriesStore {
     importantDirs?: ImportantDirs,
     customDirs?: CustomDirs,
     downloadLocationInvalid: boolean,
+    lastError?: string,
 
     setDirs: (downloadLocation?: string) => Promise<void>;
 }
@@ -44,13 +45,16 @@ export const useDirectories = create<DirectoriesStore>()((set) => ({
 
                 set({
                     importantDirs,
-                    customDirs
+                    customDirs,
+                    downloadLocationInvalid: false,
+                    lastError: undefined
                 });
             } catch (e) {
                 set({
                     importantDirs,
                     customDirs: undefined,
-                    downloadLocationInvalid: true
+                    downloadLocationInvalid: true,
+                    lastError: e as string
                 });
             }
         }