From: terencehill <piuntn@gmail.com>
Date: Sun, 20 Oct 2013 10:55:26 +0000 (+0200)
Subject: Fix placeholder image not visible when a screenshot (in general an image with .forced... 
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~31
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b64ff640017f6c43870edc34f909bf0e1ea93c20;p=xonotic%2Fxonotic-data.pk3dir.git

Fix placeholder image not visible when a screenshot (in general an image with .forcedAspect < 0) can't be read. This patch also fixes a division by 0 upon menu init as screenshot name isn't initialized yet.
(cherry picked from commit 6605e0e9a21f2848846fa0f4b4b26eb75d9d2ce2)
---

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index 8ae17dbcc..1d5471e15 100644
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -70,6 +70,12 @@ void Image_updateAspect(entity me)
 		if(me.forcedAspect < 0)
 		{
 			sz = draw_PictureSize(me.src);
+			if(sz_x <= 0 || sz_y <= 0)
+			{
+				// image is broken or doesn't exist, set the size for the placeholder image
+				sz_x = me.size_x;
+				sz_y = me.size_y;
+			}
 			asp = sz_x / sz_y;
 		}
 		else