Check for the path existence.

lygstate · May 16, 2014 · 8a55960 · 8a55960
1 parent fc105e3
commit 8a55960
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/NotepadReplacer.bat b/NotepadReplacer.bat
@@ -3,6 +3,7 @@
 cd /d %~dps0
 set WD=%CD%
 echo %WD%
+if not exist "%WD%\notepad++.exe" ( goto NoNotepadPlusPlus )
 
 :: --> Check for permissions
 net session >nul 2>&1
@@ -46,4 +47,5 @@ reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Executi
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /f /v "Notepad++" /t REG_SZ /d "%WD%"
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /f /v "readme" /t REG_SZ /d "call NotepadStarter.exe instead of original notepad.exe! To disable this option just remove notepad.exe entry"
 
+:NoNotepadPlusPlus
 ::pause
diff --git a/NotepadStarter.cpp b/NotepadStarter.cpp
@@ -305,6 +305,10 @@ wstring GetParentDir(std::wstring p) {
 
 bool LaunchProcess(STARTUPINFO& si, PROCESS_INFORMATION& oProcessInfo, std::wstring cmd, bool wait);
 
+bool ExistPath(wstring const& p) {
+	return PathFileExistsW(p.c_str()) == TRUE;
+}
+
 std::wstring QueryNotepadCommand() {
 	HKEY hKey;
 	LSTATUS errorCode = RegOpenKeyExW(
@@ -324,7 +328,7 @@ std::wstring QueryNotepadCommand() {
 		NotepadStarter = FullPath(NotepadStarter);
 		RegCloseKey(hKey);
 	}
-	if (!hasNpp) {
+	if (!hasNpp || !ExistPath(NotepadPlusPlusFolder + L"\\notepad++.exe")) {
 		std::wstring NotepadStarterCurrent = GetThisExecutable();
 		NotepadPlusPlusFolder = GetParentDir(NotepadStarterCurrent);
 		if (NotepadStarter != NotepadStarterCurrent) {

diff --git a/NotepadStarterInstall.bat b/NotepadStarterInstall.bat
@@ -3,6 +3,7 @@
 cd /d %~dps0
 set WD=%CD%
 echo %WD%
+if not exist "%WD%\notepad++.exe" ( goto NoNotepadPlusPlus )
 
 :: --> Check for permissions
 net session >nul 2>&1
@@ -19,4 +20,5 @@ reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Executi
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /f /v "Debugger" /t REG_SZ /d "%WD%\NotepadStarter.exe"
 reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\notepad.exe" /f /v "readme" /t REG_SZ /d "call NotepadStarter.exe instead of original notepad.exe! To disable this option just remove notepad.exe entry"
 
+:NoNotepadPlusPlus
 ::pause