BUG: [ 2536582 ] Register.bat should use Find with full path.

 Fix submitted by Joe Kidd

diff --git a/Docs/Users/ChangeLog.txt b/Docs/Users/ChangeLog.txt
index 3328f95..dc09b80 100644 (file)
--- a/Docs/Users/ChangeLog.txt
+++ b/Docs/Users/ChangeLog.txt
@@ -4,6 +4,7 @@ to Subversion revision numbers (rXXXXX). To open the tracker item, go to URL:
 http://winmerge.org/tracker/[tracker-id]
 
 WinMerge 2.13.2
+  Register.bat should use Find with full path (#2536582)
   Bugfix: Creating new files caused message about missing files (#2515875)
   Bugfix: Could not hide folders in recursive compare (#2528749)
   Bugfix: Folder Compare:Copy Right/Left don't create folder

diff --git a/Docs/Users/Contributors.txt b/Docs/Users/Contributors.txt
index bbe1270..3b33549 100644 (file)
--- a/Docs/Users/Contributors.txt
+++ b/Docs/Users/Contributors.txt
@@ -141,6 +141,7 @@ Other Contributors (code, ideas, testing..):
 * jwdevel
 * Ed_K
 * Alberto Kalb
+* Joe Kidd <cassiusdrow@sourceforge.net>
 * Robert Knienider
 * Ferenc Kubatovics
 * René Leonhardt

diff --git a/ShellExtension/Register.bat b/ShellExtension/Register.bat
index dafc748..7829b0f 100644 (file)
--- a/ShellExtension/Register.bat
+++ b/ShellExtension/Register.bat
@@ -32,7 +32,7 @@ Call :ExecuteRegSvr32 /u "%DLLPATH%"
 Goto End
 
 :ExecuteRegSvr32
-Ver | Find "Version 6." > NUL
+Ver | %WINDIR%\System32\Find "Version 6." > NUL
 IF NOT ERRORLEVEL 1 (
   rem Windows Vista, Server 2008?
   Echo args="": For Each a in WScript.Arguments: args = args ^& """" ^& a ^& """ ": Next: CreateObject^("Shell.Application"^).ShellExecute "RegSvr32", args, "", "runas" > "%TEMP%\RegSvr32Elevated.vbs"