From 0d7496cc3ef51a48257a9ccb94d170d283080285 Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 21 Dec 2007 03:51:44 +0000
Subject: [PATCH] o Fixed our Winpcap installer so that it waits for a Winpcap
 uninstall   (if needed) to complete before trying to install the new Winpcap.
   Thanks to Jah for the patch.

---
 CHANGELOG                        | 4 ++++
 mswin32/winpcap/winpcap-nmap.nsi | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index b8be22ead..17316e058 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed our Winpcap installer so that it waits for a Winpcap uninstall
+  (if needed) to complete before trying to install the new Winpcap.
+  Thanks to Jah for the patch.
+
 o Fix a bunch of warning/error messages which contained an extra
   newline.  Thanks to Brandon Enright for the patch.
 
diff --git a/mswin32/winpcap/winpcap-nmap.nsi b/mswin32/winpcap/winpcap-nmap.nsi
index 6e4df6c80..72aae841e 100644
--- a/mswin32/winpcap/winpcap-nmap.nsi
+++ b/mswin32/winpcap/winpcap-nmap.nsi
@@ -83,7 +83,7 @@ Function .onInit
     return
 
   run_uninstaller:
-    ExecWait '"$0\Uninstall.exe"'
+    ExecWait '"$0\Uninstall.exe" _?=$INSTDIR'
 
 FunctionEnd