Allow zooming even if the image would have me.forcedAspect set to 0

diff --git a/qcsrc/menu/item/image.c b/qcsrc/menu/item/image.c
index c2a5e70b6f7e0153a7dff625eb7f549af986f0fd..06d2ad31a10370073975ad69e24e0ffde1ea5f5d 100644 (file)
--- a/qcsrc/menu/item/image.c
+++ b/qcsrc/menu/item/image.c
@@ -91,21 +91,21 @@ void Image_updateAspect(entity me)
                                me.imgSize = eX + eY * (me.size_x / (asp * me.size_y));
                        }
                }
+       }
 
-               if (me.zoomFactor)
-                       me.imgSize = me.imgSize * me.zoomFactor;
-
-               if(me.imgSize_x > 1 || me.imgSize_y > 1)
-               {
-                       me.zoomOffset_x = bound(0, me.zoomOffset_x, 1);
-                       me.zoomOffset_y = bound(0, me.zoomOffset_y, 1);
-               }
-               else
-                       me.zoomOffset = '0.5 0.5 0';
+       if (me.zoomFactor)
+               me.imgSize = me.imgSize * me.zoomFactor;
 
-               me.imgOrigin_x = 0.5 - me.zoomOffset_x * me.imgSize_x;
-               me.imgOrigin_y = 0.5 - me.zoomOffset_y * me.imgSize_y;
+       if(me.imgSize_x > 1 || me.imgSize_y > 1)
+       {
+               me.zoomOffset_x = bound(0, me.zoomOffset_x, 1);
+               me.zoomOffset_y = bound(0, me.zoomOffset_y, 1);
        }
+       else
+               me.zoomOffset = '0.5 0.5 0';
+
+       me.imgOrigin_x = 0.5 - me.zoomOffset_x * me.imgSize_x;
+       me.imgOrigin_y = 0.5 - me.zoomOffset_y * me.imgSize_y;
 }
 float Image_drag_setStartPos(entity me, vector coords)
 {