amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 21:27:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't throw internal errors when built_in_image script function fails to find an image

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-23 23:00:38 +02:00
parent 4258ce1c6c
commit 815df01ba5
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gfx/generated_image.cpp
+5 -5
View File
@@ -435,11 +435,11 @@ bool PackagedImage::operator == (const GeneratedImage& that) const {
Image BuiltInImage::generate(const Options& opt) const { Image BuiltInImage::generate(const Options& opt) const {
// TODO : use opt.width and opt.height? // TODO : use opt.width and opt.height?
Image img = load_resource_image(name); try {
if (!img.Ok()) { Image img = load_resource_image(name);
throw ScriptError(_("There is no built in image '") + name + _("'")); if (img.Ok()) return img;
} } catch (...) {}
return img; throw ScriptError(_("There is no built in image '") + name + _("'"));
} }
bool BuiltInImage::operator == (const GeneratedImage& that) const { bool BuiltInImage::operator == (const GeneratedImage& that) const {
const BuiltInImage* that2 = dynamic_cast<const BuiltInImage*>(&that); const BuiltInImage* that2 = dynamic_cast<const BuiltInImage*>(&that);