From c0ee2ce345e2a13c44cd6ed9ace297843bc43c00 Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Fri, 6 Mar 2009 17:41:35 -0500
Subject: [PATCH] Fixed assorted updater bugs (bug 3697, r=pred,
 a121=blocking).

---
 extensions/curl/curl-src/lib/build_libcurl.vcproj | 2 +-
 extensions/curl/msvc9/curl.vcproj                 | 2 +-
 extensions/updater/extension.cpp                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/curl/curl-src/lib/build_libcurl.vcproj b/extensions/curl/curl-src/lib/build_libcurl.vcproj
index 5597940f..2ab26d4d 100644
--- a/extensions/curl/curl-src/lib/build_libcurl.vcproj
+++ b/extensions/curl/curl-src/lib/build_libcurl.vcproj
@@ -136,7 +136,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories=".,..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB"
+				PreprocessorDefinitions="WIN32;_DEBUG;BUILDING_LIBCURL;CURL_STATICLIB;CURL_DISABLE_LDAP"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/extensions/curl/msvc9/curl.vcproj b/extensions/curl/msvc9/curl.vcproj
index a2a55b84..8ae5d8e0 100644
--- a/extensions/curl/msvc9/curl.vcproj
+++ b/extensions/curl/msvc9/curl.vcproj
@@ -64,7 +64,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="..\curl-src\lib\LIB-Release\libcurl.lib ws2_32.lib"
+				AdditionalDependencies="..\curl-src\lib\LIB-Debug\libcurld.lib ws2_32.lib"
 				OutputFile="$(OutDir)\webternet.ext.dll"
 				LinkIncremental="2"
 				IgnoreDefaultLibraryNames="LIBC;LIBCD;LIBCMT"
diff --git a/extensions/updater/extension.cpp b/extensions/updater/extension.cpp
index 4419c0b6..73525620 100644
--- a/extensions/updater/extension.cpp
+++ b/extensions/updater/extension.cpp
@@ -139,7 +139,7 @@ static void PumpUpdate(void *data)
 			smutils->BuildPath(Path_SM, path, sizeof(path), "gamedata/%s", part->file);
 			if (libsys->IsPathDirectory(path))
 			{
-				continue;
+				goto skip_create;
 			}
 			if (!libsys->CreateFolder(path))
 			{
@@ -157,7 +157,7 @@ static void PumpUpdate(void *data)
 			if (fp == NULL)
 			{
 				AddUpdateError("Could not open %s for writing", path);
-				return;
+				goto skip_create;
 			}
 			if (fwrite(part->data, 1, part->length, fp) != part->length)
 			{