From fa55fbd690b0c1365bcbe42fbb6a0ed2fd0f2ae7 Mon Sep 17 00:00:00 2001
From: Djack Donovan <djack.d.donovan@gmail.com>
Date: Sun, 9 Oct 2022 01:57:34 +0200
Subject: [PATCH] Improved combine_blend error message

may it save future script programmers hours of debugging
---
 src/gfx/generated_image.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gfx/generated_image.cpp b/src/gfx/generated_image.cpp
index 5465c16f0..a8f025820 100644
--- a/src/gfx/generated_image.cpp
+++ b/src/gfx/generated_image.cpp
@@ -133,7 +133,10 @@ bool MaskedBlendImage::operator == (const GeneratedImage& that) const {
 
 Image CombineBlendImage::generate(const Options& opt) const {
   Image img = image1->generate(opt);
-  combine_image(img, image2->generate(opt), image_combine);
+  Image img2 = image2->generate(opt);
+  if (img.GetWidth() != img2.GetWidth() || img.GetHeight() != img2.GetHeight())
+	throw ScriptError(_("Combined images must be of the same size"));
+  combine_image(img, img2, image_combine);
   return img;
 }
 ImageCombine CombineBlendImage::combine() const {