Do not reset config to default if config file can't be opened.

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index ef6058212a2a56d84bd6eeb7aef1b3a224758408..36cd8195d57c30fff6cb16d43f3d1577024139eb 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -4249,7 +4249,24 @@ static TCHAR *HandleConfiguration (HWND hDlg, int flag, struct ConfigStruct *con
                        TCHAR szMessage[MAX_DPATH];
                        WIN32GUI_LoadUIString (IDS_MUSTSELECTCONFIG, szMessage, MAX_DPATH);
                        pre_gui_message (szMessage);
-               } else {
+                       ok = 0;
+               }
+               if (ok && !zfile_exists(path)) {
+                       TCHAR fname[MAX_DPATH];
+                       fetch_configurationpath(fname, sizeof(fname) / sizeof(TCHAR));
+                       if (_tcsncmp(fname, path, _tcslen(fname)))
+                               _tcscat(fname, path);
+                       else
+                               _tcscpy(fname, path);
+                       if (!zfile_exists(fname)) {
+                               TCHAR szMessage[MAX_DPATH];
+                               WIN32GUI_LoadUIString(IDS_COULDNOTLOADCONFIG, szMessage, MAX_DPATH);
+                               pre_gui_message(szMessage);
+                               config_filename[0] = 0;
+                               ok = 0;
+                       }
+               }
+               if (ok) {
                        if (target_cfgfile_load (&workprefs, path, configtypepanel, 0) == 0) {
                                TCHAR szMessage[MAX_DPATH];
                                WIN32GUI_LoadUIString (IDS_COULDNOTLOADCONFIG, szMessage, MAX_DPATH);