Merge pull request #1745 from daxgames/fix_reg_cleanup

Fixes for recent reworks
This commit is contained in:
Benjamin Staneck 2018-04-13 18:27:11 +02:00 committed by GitHub
commit a1e47ceaca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 3 deletions

View File

@ -334,6 +334,7 @@ void UnregisterShellMenu(std::wstring opt, wchar_t* keyBaseName)
HKEY cmderKey; HKEY cmderKey;
FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL)); FAIL_ON_ERROR(RegCreateKeyEx(root, keyBaseName, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, NULL, &cmderKey, NULL));
FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL)); FAIL_ON_ERROR(RegDeleteTree(cmderKey, NULL));
RegDeleteKeyEx(root, keyBaseName, KEY_ALL_ACCESS, NULL);
RegCloseKey(cmderKey); RegCloseKey(cmderKey);
RegCloseKey(root); RegCloseKey(root);
} }

2
vendor/init.bat vendored
View File

@ -302,8 +302,8 @@ if defined CMDER_USER_CONFIG (
) )
if not exist "%initialConfig%" ( if not exist "%initialConfig%" (
(
echo Creating user startup file: "%initialConfig%" echo Creating user startup file: "%initialConfig%"
(
echo :: use this file to run your own startup commands echo :: use this file to run your own startup commands
echo :: use in front of the command to prevent printing the command echo :: use in front of the command to prevent printing the command
echo. echo.

View File

@ -76,5 +76,4 @@ exit /b
:::------------------------------------------------------------------------------- :::-------------------------------------------------------------------------------
echo ERROR: %~1 echo ERROR: %~1
echo CMDER Shell Initialization has Failed!
exit /b exit /b

View File

@ -46,7 +46,7 @@ exit /b
:: check if the executable actually exists :: check if the executable actually exists
if not exist "%git_executable%" ( if not exist "%git_executable%" (
%lib_console% show_error "%git_executable%" does not exist! %lib_console% debug-output :read_version "%git_executable% does not exist."
exit /b -255 exit /b -255
) )