From 1e006112cf7b601379a98ed2f4e50b3f62fd2965 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 20 Dec 2002 11:58:54 +0000 Subject: [PATCH] Fixed bug item #656371 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1980 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSISdl/nsisdl.cpp | 10 +++++----- Plugins/nsisdl.dll | Bin 12800 -> 12800 bytes 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 449ce69c..70c2f15a 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -209,6 +209,7 @@ __declspec(dllexport) void download (HWND parent, g_hwndProgressBar = GetDlgItem (g_dialog, IDC_PROGRESS1); + JNL_HTTPGet *get; char *error=NULL; { @@ -245,7 +246,7 @@ __declspec(dllexport) void download (HWND parent, } DWORD start_time=GetTickCount(); - JNL_HTTPGet *get=new JNL_HTTPGet(JNL_CONNECTION_AUTODNS,16384,(p&&p[0])?p:NULL); + get=new JNL_HTTPGet(JNL_CONNECTION_AUTODNS,16384,(p&&p[0])?p:NULL); int st; int has_printed_headers = 0; int cl; @@ -374,8 +375,6 @@ __declspec(dllexport) void download (HWND parent, } - delete get; - WSACleanup(); } @@ -394,7 +393,7 @@ __declspec(dllexport) void download (HWND parent, } if (g_cancelled) { - setuservariable(INST_0, "cancel"); + setuservariable(INST_0, "cancel"); DeleteFile(filename); } else if (error == NULL) { setuservariable(INST_0, "success"); @@ -402,7 +401,8 @@ __declspec(dllexport) void download (HWND parent, DeleteFile(filename); setuservariable(INST_0, error); } - if (error) GlobalFree(error); + + delete get; } } diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index a439a297dc73f968029e51da70ffdaedfa87ba8f..7ad7ae43f950539471ff63b75673a6eaa9c30fe9 100644 GIT binary patch delta 819 zcmYk4ZAep57{|}KI(N6GU2N){nlCMlX1<_>b3M~Cl77mP(I3X2Ms8n>jck_c^&iS4H^MB5B4$sq4(Nb~! zW3X2dbkwub%ak!>h{+=3Fa>@gAK(D|Ei^KV5ay7g;2fwBI)fu2>?1>pG`K+K6-Ic2 z{8j9QdXf~9l3o-8faqW=JM#9^!xDGorIw#BefgXPX7`#q#N~B{S22YY%eF%_oiv2_ zLY;a5+?%bU=uprqVpHaarfgFp$RlNb_)N6yafv(IdH?`T9DPDKwm8hTCD$Ho($I6H znyrRb@|iWj3Bs!O!FH0VN`RNhX_ZMGrvt#{t?i?!WI)ws=!o*az$tHaTx*zEEY`7< z@gKDkYv_6;IiZe&i{zsERP00~0Iky+wA>u!o-)oBx^oTMpiPVH>nCs2c74{C!J%o= zx{qs&GeJKK#d_9E^+M5(%Su=vJPZHFz!UL~ns{oh{HuRbRXAvW~48Xa(4!gbG z1~{q<#JbN)tO@W~vBV(2D>DCL{rO|Ep9c7SnZ&*Tb8_x{fLYlyEwP18N~_hnTInY9 zQJvA_vNqgsObRFX1C#6-z?tbTaz&S+(o0h7wDxNO8P(mDx^9VXgis?a=>I@iL*`=3 z;j(Zbu1=nWTf3bMeMqw7yK|LLu3(oh5+m}ZZ>`3o4TsY1l&Y+1w&`XIU6LAUwW1%j zVeUD4`7bpniXr8fL%JIO$O*mEmIMaeZtm*xpR1d!UuEbR+Mjed|yEBz_&oWKiH5|r77Y?s%n7uXQ;2WwC9WvtWC>g=#aCumc*IDpI6^k8Rr?4Z&S4$M06627{`Uze2{}!UPhBhi3iLt2WevGl8dIlBt@Bw8lD;wDw zU@xqP?7gaXZufE}yf7N*5!NEn%`@08TeiWaNG-kQ&*kir?IPGDk9`lo3~3`V-DiZ!qIXZDQa#-|_zu30`|)c$j3f9bHV_xd zBL&1wsz^2QlXh~PbdYXxm-LY^86|&-k)EX&XcxUfZ_^-sNT1P{bcnvEAsVJ%=`Si( KW_LoIGVMQe+bxj*