From 2fed742279f85139d51e2ed112c2c0cd0c86a99e Mon Sep 17 00:00:00 2001
From: anoncvs_ezcontents
 <anoncvs_ezcontents@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 10 Feb 2004 23:29:49 +0000
Subject: [PATCH] Calling show after a failed initDialog caused a freeze.

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3488 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/InstallOptions/InstallerOptions.cpp |   8 ++++----
 Plugins/InstallOptions.dll                  | Bin 12288 -> 12288 bytes
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index b1e90ed3..154165d6 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -1306,7 +1306,7 @@ void WINAPI showCfgDlg()
   int i = nNumFields;
   while (i--) {
     FieldType *pField = pFields + i;
-    
+
     int j = FIELD_BUFFERS;
     while (j--)
       FREE(((char **) pField)[j]);
@@ -1334,9 +1334,8 @@ extern "C" void __declspec(dllexport) dialog(HWND hwndParent, int string_size,
     pushstring("error");
     return;
   }
-  if (createCfgDlg()) {
+  if (createCfgDlg())
     return;
-  }
   popstring(NULL);
   showCfgDlg();
 }
@@ -1350,8 +1349,9 @@ extern "C" void __declspec(dllexport) initDialog(HWND hwndParent, int string_siz
     pushstring("error");
     return;
   }
+  if (createCfgDlg())
+    return;
   initCalled++;
-  createCfgDlg();
 }
 
 extern "C" void __declspec(dllexport) show(HWND hwndParent, int string_size,
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index dd0de3bd2dbebe5f36c2e1ee4369a891ae534dd2..d99b14d4a6c99d589c2461bba3a0bb53ad3978f3 100644
GIT binary patch
delta 1448
zcmc(fZA@EL7{|{Umr__?Zh<>qI#`E@Y>;iba$89kE(z@#-G_z&^(~V)WfkMVrA1>f
zR9+%Y#mqek86PBb&Nx397fXzZ#C5E3UB(PECL_zT%*5z5Rl@dRu#9>9UpBw_eJA<#
zIp=@=&wb8)?!Aq7$GeX%Z2k51Z5n$xZZg}}joidoIRy2AX!-coRW4E&dCLYza2J#3
zBsMZwE3v3aJl;kXQo|D()Gqy;5aIwfMYL8DiVvC=(m#P{2qB?p^oG>L7wJ=}hW|nt
zsgW<xE$IaJ(Xsr#&GqoZSQ?HbIAfi9;-B@z(k`LYQ<bS5=6+L$Ckxx|i>(cp^Uj4j
z!$NUmoh$9RQ1H@`oW%%-bNNPy?(GzcVGbvCOz56T-8qltNXCLH@>$ly<cO~g`$G9o
zZ#sPl_YrYFP`%V$u-ExNdy#q=gyN;Sf)>7uHkg}vZEBCXj6d_xoY>QW3q>-p>4$L}
zoe{H!>E{l{#?py^%RYJyw|I6OVrN+Y2y$c=-bBEyw;1-YK10)mPjihH3+wnKiNY;>
zfVLF5P)#eUC^y=j49L0S_}#&nDehugt^obbrrs+0j-#F1Emhn_LCb;aSK%B>N9_}1
zqquNL40!eXD?&{8*WiDSGM0ml3$WY?sM3UgJQOtxWfkk3NhoXUsj+JBdTO*)DC|kv
zZ}syGO<5QDC>^mi^I7`J=HhAk$@UGuPVd`&`~>}AZ|A>}L$2e0kym~V&S}}_=*Q(m
zY;EMnS`k~tGmTPCcFFPeBKFa@@vL#8Q{;4fz;DuLju^^R6i@PgI#ayQTDqQ`NiHK%
zroxi?N;8zC|9EfZ)blHMyR@l>xhty)|BO&1dbZ>s57E~pD|{*SMd?mnHVAJb(3W%b
z9_nR6*@q=+y+eO1-}5Yexv8CJQ)`>doX=B!`Tnw?QLHJ5_anKCSH&_BFkW7Fs;@lB
zxlZ>gF39@JcZ3*A$4nw$gYP_DsoZXDy)VRhVKsz5-zBrNfj5%d*^Cl>&KL1}$>|;%
zZer{hm<Hd1ELa3fz!-JA8MA@kpJMC<#M_A1z$`cePJu}<4t&@T0b}&wQ~eN}1X0ih
zjM3p{EC>d`u$v9BW=xilbP{m}%z}Av9oz;o*a0@<K#f2H9pDvk19=M|4Q9Y;FbPIM
z6x1M(!N(A7h&_l$4b6~nAeWlQn3;Ih$j~F~fzg7YN7w_jKurx-w@Z2W-=(WH+xX8Z
i{@9xvmCNd)dPDs~T~=4rJdeZU_Vjr!rABtV$NvR$BC#m|

delta 1429
zcmd^<?@wD*7{||Hm(oIMZ-Ki41=b-V3fVwPsicI?v>kDK(Ez3X%0is71|!3zohD-J
z))HxIles4@@<KA_61NwN#u8&9aSR*T3>uc0K+H6Iu`G8fo7)nBWo*aq?dCiG15fhl
zIp_O)&w0+T-q=uV=-ATsJ%8Ig>~XouOxsJij<HGz&PQU&$9I<b!^|b#Q(y_SGI?HN
z@$m+UMRelHUaFFspYlQ-R4)i2_8}-D4U$ki&^!V4Gl-fH5Q>-Hlsfno`dq5#S1BvC
z@N0BOI>|kByzpR+1AZ7QLg6H5ET|?Q<_A^`3dKRSx;~i4bOW8Mu(e;>)%?qr3xQxr
zC@%DK6~hZfuO7-7wQ4k1s8x~OL7`~oP)bFE?(3X8RdnN7BeKZn*)WsCZZG0O`B(2a
za{&7YJ07WS8Y<dt`;S<-2?n9KX}+k3H&KDUi`z5ZdMkh7u{qg2fQiCc*wj&MBN*0u
z&^&EnY+^3yx0@5cV~gh}AqGQg8gh6R-lX55_GtEynxSdKbKFZShDQDg3BxuXrESG_
zWb+hPRcgnb^2@oh*uC+nE@o$*ToKN9HS>1ycO1w0jIowCP_J=c-HUKe%tg%Ui3BDN
zh{G=R!MYG>-zNO8Q`We@<r*w&ey5c7O$H)*p|Ca_s7@#w`JvG|SAJ+@mryoaslU|6
zS7@qqg)h<}Qx{*Nb0$0gjea$K!{_LT+0C=`gSn4iB#Ye0-zAs)2AtEf+Y-TaBDxv>
zsX;_HaHnIGlkIXMpTwMa2X~DX&63UXAwNl9SfWT%Rd#|$=<Bk*rBZ%yHgy{V^<*e-
zs+OUoe4ma~PrbB$Z_qQ<Jb!s3>6;Ns1??%{&s*rL@^yYQ^JT?OZjHg4^m}ubkpm-4
zD0|UGu5r4le9u?u?AAWMn%Uf{=Uk=2%6_Z%#6?Fh-bd;-o{BN;*B-AcbFebS`Dwae
zwNSlK=s_5F$ZiDJgh+WC^zm*@Vl-WCRiY)~4IeK2`3FM$C`z@!jrYi4Yv!%gVe3ND
zG21KnU9>rz>}UsLE8rsd7EFWV;1<w|shzP#aQ9ip0;pdG*Qu?>`hgp*NvK+h;J^A2
zI0c5mAka#$gRucH3=V^%pbMM=Ghh}hf-B%IV906$HJ}A}zyNp+>_EI8$ePcAufr`Y
z;7_mw=0F4_zzJ{$%z$H>8O4qT>4AfIZM^OOwBgK=x_)U3KC-l2|1`gx;ZM9(qGX-R
b&Oe;joqsvkoCTe7XM5*p=g*n=j`#ULUn{N1