From 30ddac3253cc6cc33bcf2fc8c31b443ed5de5e17 Mon Sep 17 00:00:00 2001
From: Ron Pedde <ron@pedde.com>
Date: Thu, 8 Jun 2006 09:37:04 +0000
Subject: [PATCH] Fix the "file in use problem on install"

---
 win32/nsi/mt-daapd.nsi.templ | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/win32/nsi/mt-daapd.nsi.templ b/win32/nsi/mt-daapd.nsi.templ
index 38c46028..e3adffb3 100644
--- a/win32/nsi/mt-daapd.nsi.templ
+++ b/win32/nsi/mt-daapd.nsi.templ
@@ -95,11 +95,12 @@ Section -Pre
   nsSCM::Stop "${PRODUCT_NAME}"
 
   lbl_wait_stop:
-  Sleep 200
+  Sleep 1000
   nsSCM::QueryStatus "${PRODUCT_NAME}"
   Pop $0
   Pop $1
 
+  DetailPrint $0
   StrCmp $0 "success" lbl_check_status
   goto lbl_continue
   
@@ -108,20 +109,22 @@ Section -Pre
 
   lbl_continue:
   ; should really loop until service stops...
-  DetailPrint "Sent stop message... waiting for stop"
+  DetailPrint "Waiting for service stop ($9)"
    
-  Sleep 1000
-  Delete $2\firefly.exe
   IntOp $9 $9 + 1
-  IntCmp $9 10 +1 +2
+  IntCmp $9 10 +1 +1 lbl_done_pre
+
+  Sleep 1500
+  Delete $2\firefly.exe
   IfErrors lbl_continue
  
+ lbl_done_pre:
 
 SectionEnd
 
 Section "MainSection" SEC01
   SetOutPath "$2"
-  SetOverwrite ifnewer
+  SetOverwrite on
   File /oname=firefly.exe "${MTD_SOURCE}\mt-daapd.exe"
   File "${CONFIG_SOURCE}\FireflyShell.exe" 
   File "${CONFIG_SOURCE}\..\FireflyShell.exe.manifest"