Set a fall back for editor if file association fails

- When registry keys were simplified, the log viewer and editor
  entries were removed in favour of file associations that the
  user can independently control.

  Yet, there are times when an associated application fails to start
  or no associations are present etc., and its useful to have a fall
  back editor setting to open config and log files.
  This patch sets that default as "notepad.exe"

- Also remove the unused profile_dir[] in registry.c
  and have add a default for Windows directory

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/212/head
Selva Nair 2018-01-28 22:14:34 -05:00
parent b18d1a9245
commit c965ca2749
1 changed files with 5 additions and 6 deletions

View File

@ -74,19 +74,18 @@ GetGlobalRegistryKeys()
{ {
TCHAR windows_dir[MAX_PATH]; TCHAR windows_dir[MAX_PATH];
TCHAR openvpn_path[MAX_PATH]; TCHAR openvpn_path[MAX_PATH];
TCHAR profile_dir[MAX_PATH];
HKEY regkey; HKEY regkey;
if (!GetWindowsDirectory(windows_dir, _countof(windows_dir))) { if (!GetWindowsDirectory(windows_dir, _countof(windows_dir))) {
/* can't get windows dir */ /* can't get windows dir */
ShowLocalizedMsg(IDS_ERR_GET_WINDOWS_DIR); ShowLocalizedMsg(IDS_ERR_GET_WINDOWS_DIR);
return(false); /* Use a default value */
_sntprintf_0(windows_dir, L"C:\\Windows");
} }
if (SHGetFolderPath(NULL, CSIDL_PROFILE, NULL, SHGFP_TYPE_CURRENT, profile_dir) != S_OK) { /* set default editor and log_viewer as a fallback for opening config/log files */
ShowLocalizedMsg(IDS_ERR_GET_PROFILE_DIR); _sntprintf_0(o.editor, L"%s\\%s", windows_dir, L"System32\\notepad.exe");
return(false); _sntprintf_0(o.log_viewer, L"%s", o.editor);
}
/* Get path to OpenVPN installation. */ /* Get path to OpenVPN installation. */
if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\OpenVPN"), 0, KEY_READ, &regkey) if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\OpenVPN"), 0, KEY_READ, &regkey)