From ab0d336751a87a710f47a949d2724cbeb335d301 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Fri, 2 Apr 2010 15:24:33 +0000 Subject: [PATCH] Fix crash in inputbox when called with wrong arguments (negative precision for number input). Tweaked colors of icons git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1435 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- share/grafx2/gfx2.gif | Bin 1157 -> 1154 bytes share/grafx2/gfx2.png | Bin 638 -> 1436 bytes src/factory.c | 3 +++ 3 files changed, 3 insertions(+) diff --git a/share/grafx2/gfx2.gif b/share/grafx2/gfx2.gif index 63f78103b5368fdc4e1eb649ab8c2d397855fe77..44c6a7fcb3ffedcd8b3b019ad1e5d9555b014d2a 100644 GIT binary patch literal 1154 zcmZ?wbhEHbRA5kGn9jiP9|##3lEmr^x%UBi4GsT~p8gL6K*3Qk8Un*U1QdU=u!2&% z4#=mVJi*TKpMjA>#$&?*M+QbAt(cC2g@>D&nPn^z5*9UfvoI;lIdO3jV=ud^n1;iG zB_|oBRO3tn8lIkDQs87u@LX_!aguuQy_A=mo}HM%k$G)T<|Kww3-sKt#c%~b@R{Sh zQ0nT`k8O;ABQ~CMnl?8DNyOw5dPCmZgf1_Az^rdIs+vEDPrk*l;6}re$@Yj|o z@%-rh?sNGTL|@kp+^)*(E)%m|H*9|;FPlWbjK|3nBdW$eFU-#-YJ)_ciJC`2M_NhwoE1bn~L9mMe literal 1157 zcmZ?wbhEHbRA5kGn9cwK4Pe{=rW$~}1`s%K;J_cC_#cKpUAs zOnl_p%dRSAaA3g_PbMkVIFp8iCms`67%dbk9~@+y%oC7jVz61&bGm`xIi1MQ&rVJe zjop>_g)vZ$e1Da5DZo$rb2QYjXP%KTf$ z+ip8O@saqFx^1GO+ObICwP&xpnXY#0n5ds}#z!^3?1IIYxV5Y1?|Rog+u*}plede? zVt1}dnb_)IZ93;${<{wT1x;buv6c^~+?=^PY1=;Wub(Ed9_ZhG_m0hHrkAZo2D?=;`+iap`MuyVx7PEZM$+$7*6#>$XW9 zG7pjtd46@9Vt1QWVcsc~J-NTbM0#DyJ*F0MYG3c#`-fxFv<|hsXZUNMB=l7me{!c+jAj9=*aJ~z- zrYy(3f)5MxzeY?ueDbioOIX;1C);?^&$NB0jeq-D_2PEc4`o7`_SyQO(t1iWuGdaA zjsIG{d*ib|0;Z3y*thQVyT+TqP9EF>cgKxCEXY{Wye$7H&t(~gpWUC_?mXW4|2_54ilOozV}-xiMDdv!?IDM56jsi6iQV&S#sXFk?}c?|{_NpdBeE&< zx_d0U->qL4C)dfb+f;B((?9y1<(5&-UcrY-uZ2IldX#SZRl9>@wTA2YYT2xCu2Yx3 z*@kw1nclvf@A*pmj?kqiOSZgzbIG>)|L@PcWY>LT7ZXq{J0P3;3Y3jJUHx3vIVCg! E0ObEZ=>Px# delta 625 zcmV-%0*?Kh3;qO<7=Hu<0001`EabER0004VQb$4nuFf3k0000OP)t-sVQ>Hd00000 z|9}910DypifPlcj!2kdMNK0?u00001bW%=J06^y0W&i*J2T4RhR5;5`l+BKuFc5^{ z4K}+gah|pXXRx$6uVrcOx#S$Q3gMnG3l7w(5-DSR@3iAkJ7DNz`Jd=VHot*e`&?^x(o zCfX5BQN$Zzfn+7a*I+3Zdk32?kJrkDpA=qC(EqImmO@AKCINjac2_ zjPevSl-&mlh4KazuBVf8DZNYvbltl zi`ENh2!&1A*b`_70-bcL`UG@?JIC!2#{Lui0V7rH_J8&iR5xTcZk>4hDGdVMc@zgb<@ zWkFmf7~m1P5KPF{>DCAnareU|&(xJ|qd7J`ffKevA}Qpx1?&hDA)U{C4X?pB8M%SsomL)tm5^ zP>$p!$*kx(8a@1iGUvtmD&k#xqY_Lwd=PJ~|H;?foqtQ`WSr-JXA|I8WFz3V00000 LNkvXXu0mjfbj%x0 diff --git a/src/factory.c b/src/factory.c index 9868d7d1..cea21a32 100644 --- a/src/factory.c +++ b/src/factory.c @@ -577,6 +577,9 @@ int L_InputBox(lua_State* L) LUA_ARG_NUMBER(setting*args_per_setting+6, "inputbox", decimal_places[setting], -15.0, 15.0); if (decimal_places[setting]>15) decimal_places[setting]=15; + if (min_value[setting]!=0 || min_value[setting]!=1) + if (decimal_places[setting]<0) + decimal_places[setting]=0; // Keep current value in range if (decimal_places[setting]>=0) current_value[setting] = Fround(current_value[setting], decimal_places[setting]);