Fallback to null check loading if unityVersion throws an exception

sinai-dev · sinai-dev · commit dfd55260a84c · 2021-07-15T05:19:48.000+10:00
diff --git a/src/UI/UIManager.cs b/src/UI/UIManager.cs
@@ -414,7 +414,7 @@ private static void CreateTopNavBar()
 
         private static void LoadBundle()
         {
-            AssetBundle bundle = null;
+            AssetBundle bundle;
             try
             {
                 // Get the Major and Minor of the Unity version
@@ -433,10 +433,10 @@ private static void LoadBundle()
                 else
                     bundle = LoadBundle("legacy");      
             }
-            catch (Exception ex)
+            catch
             {
-                ExplorerCore.LogWarning($"Exception loading Explorer AssetBundle!");
-                ExplorerCore.Log(ex);
+                ExplorerCore.LogWarning($"Exception parsing Unity version, falling back to old AssetBundle load method...");
+                bundle = LoadBundle("modern") ?? LoadBundle("legacy.5.6") ?? LoadBundle("legacy");
             }
 
             AssetBundle LoadBundle(string id)

Original file line number	Diff line number	Diff line change
`@@ -414,7 +414,7 @@ private static void CreateTopNavBar()`
`414`	`414`
`415`	`415`	`private static void LoadBundle()`
`416`	`416`	`{`
`417`		`- AssetBundle bundle = null;`
	`417`	`+ AssetBundle bundle;`
`418`	`418`	`try`
`419`	`419`	`{`
`420`	`420`	`// Get the Major and Minor of the Unity version`
`@@ -433,10 +433,10 @@ private static void LoadBundle()`
`433`	`433`	`else`
`434`	`434`	`bundle = LoadBundle("legacy");`
`435`	`435`	`}`
`436`		`- catch (Exception ex)`
	`436`	`+ catch`
`437`	`437`	`{`
`438`		`- ExplorerCore.LogWarning($"Exception loading Explorer AssetBundle!");`
`439`		`- ExplorerCore.Log(ex);`
	`438`	`+ ExplorerCore.LogWarning($"Exception parsing Unity version, falling back to old AssetBundle load method...");`
	`439`	`+ bundle = LoadBundle("modern") ?? LoadBundle("legacy.5.6") ?? LoadBundle("legacy");`
`440`	`440`	`}`
`441`	`441`
`442`	`442`	`AssetBundle LoadBundle(string id)`