Ticket #8275: win_cfg_progdir.diff

main.cpp

@@ -165 +165 @@
 #else
         char scummhome[256];
         #if defined (WIN32) && !defined(_WIN32_WCE)
-                GetWindowsDirectory(scummhome, 256);
-                strcat(scummhome, "\\");
+                // Quietust - try looking for INI file in program directory first
+                GetModuleFileName(NULL, scummhome, 256);
+                int i = strlen(scummhome) - 1;
+                while (scummhome[i] != '\\')
+                        scummhome[i--] = 0;
                 strcat(scummhome, DEFAULT_CONFIG_FILE);
+                if (GetFileAttributes(scummhome) == 0xFFFFFFFF) {
+                        // does not exist in program directory, default to Windows directory
+                        GetWindowsDirectory(scummhome, 256);
+                        strcat(scummhome, "\\");
+                        strcat(scummhome, DEFAULT_CONFIG_FILE);
+                }
         #elif defined(__PALM_OS__)
                 strcpy(scummhome,"/PALM/Programs/ScummVM/");
                 strcat(scummhome, DEFAULT_CONFIG_FILE);