From 815df01ba5039def6ccc71b504f346e5bbcb87f0 Mon Sep 17 00:00:00 2001 From: Twan van Laarhoven Date: Thu, 23 Apr 2020 23:00:38 +0200 Subject: [PATCH] Don't throw internal errors when built_in_image script function fails to find an image --- src/gfx/generated_image.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gfx/generated_image.cpp b/src/gfx/generated_image.cpp index 00338254..a1ab0226 100644 --- a/src/gfx/generated_image.cpp +++ b/src/gfx/generated_image.cpp @@ -435,11 +435,11 @@ bool PackagedImage::operator == (const GeneratedImage& that) const { Image BuiltInImage::generate(const Options& opt) const { // TODO : use opt.width and opt.height? - Image img = load_resource_image(name); - if (!img.Ok()) { - throw ScriptError(_("There is no built in image '") + name + _("'")); - } - return img; + try { + Image img = load_resource_image(name); + if (img.Ok()) return img; + } catch (...) {} + throw ScriptError(_("There is no built in image '") + name + _("'")); } bool BuiltInImage::operator == (const GeneratedImage& that) const { const BuiltInImage* that2 = dynamic_cast(&that);