Fixed various exception types not being wrapped by ContentLoadExceptions when loading raw or JSON content

CHANGELOG.md

@@ -28,6 +28,10 @@ Improvements
 - Allow scrolling panels to contain other scrolling panels
 - Allow dropdowns to have scrolling panels
 
+### MLEM.Data
+Fixes
+- Fixed various exception types not being wrapped by ContentLoadExceptions when loading raw or JSON content
+
 ## 6.2.0
 
 ### MLEM

MLEM.Data/Content/RawContentManager.cs

@@ -100,7 +100,7 @@ namespace MLEM.Data.Content {
                                 r.Name = assetName;
                             return t;
                         }
-                    } catch (FileNotFoundException) {}
+                    } catch (IOException) {}
                 }
             }
             throw new ContentLoadException($"Asset {assetName} not found. Tried files {string.Join(", ", triedFiles)}");

MLEM.Data/ContentExtensions.cs

@@ -68,7 +68,7 @@ namespace MLEM.Data {
                         using (var reader = new JsonTextReader(stream))
                             return serializerToUse.Deserialize<T>(reader);
                     }
-                } catch (FileNotFoundException) {}
+                } catch (IOException) {}
             }
             throw new ContentLoadException($"Asset {name} not found. Tried files {string.Join(", ", triedFiles)}");
         }