From d7ca86c446106c96067d32679c66f57ed68660f7 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 24 Sep 2004 11:26:35 +0000
Subject: [PATCH] don't try to delete a directory after reboot if it's not even
 valid

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3659 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/exehead/util.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index 2006921b..376d84c4 100644
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -101,9 +101,10 @@ void NSISCALL myDelete(char *buf, int flags)
   HANDLE h;
   WIN32_FIND_DATA fd;
   char *fn;
+  int valid_dir=is_valid_instpath(buf);
 
 #ifdef NSIS_SUPPORT_RMDIR
-  if (!(flags & DEL_DIR) || (is_valid_instpath(buf) && (flags & DEL_RECURSE)))
+  if (!(flags & DEL_DIR) || (valid_dir && (flags & DEL_RECURSE)))
 #endif//NSIS_SUPPORT_RMDIR
   {
     mystrcpy(lbuf,buf);
@@ -173,7 +174,7 @@ void NSISCALL myDelete(char *buf, int flags)
   }
 
 #ifdef NSIS_SUPPORT_RMDIR
-  if (flags & DEL_DIR)
+  if (valid_dir && (flags & DEL_DIR))
   {
     addtrailingslash(buf);
     log_printf2("RMDir: RemoveDirectory(\"%s\")",buf);