Fix crash if UserMapsFolder is invalid (#1)

GreepTheSheep · Dec 25, 2021 · 215f8cf · 215f8cf
1 parent 440c055
commit 215f8cf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/Main.as b/src/Main.as
@@ -199,9 +199,15 @@ string changeEnumStyle(string enumName){
 }
 
 string UserMapsFolder(){
-    CSystemFids@ userFolder = Fids::GetUserFolder('Maps');
-    if (userFolder is null) return "<Invalid>";
-    CSystemFids@ Tree = userFolder.Trees[0];
-    CSystemFidFile@ Fid = Tree.Leaves[0];
-    return Fid.ParentFolder.ParentFolder.FullDirName;
+    try {
+        CSystemFids@ userFolder = Fids::GetUserFolder('Maps');
+        if (userFolder is null) return "<Invalid>";
+        CSystemFids@ Tree = userFolder.Trees[0];
+        if (Tree is null) return "<Invalid>";
+        CSystemFidFile@ Fid = Tree.Leaves[0];
+        if (Fid is null) return "<Invalid>";
+        return Fid.ParentFolder.ParentFolder.FullDirName;
+    } catch {
+        return "<Invalid>";
+    }
 }
diff --git a/src/Utils/MX/Methods.as b/src/Utils/MX/Methods.as
@@ -35,6 +35,8 @@ namespace MX
 
     void DownloadMap(int mapId)
     {
+        if (UserMapsFolder() == "<Invalid>") return;
+
         string downloadedMapFolder = UserMapsFolder() + "Downloaded";
         string mxDLFolder = downloadedMapFolder + "/" + pluginName;
         if (!IO::FolderExists(downloadedMapFolder)) IO::CreateFolder(downloadedMapFolder);