From bebc935923035ade72daa5ac62868c650fde4c8f Mon Sep 17 00:00:00 2001
From: FunkyFr3sh <cc.red.alert.1@googlemail.com>
Date: Sun, 24 Sep 2023 20:13:20 +0200
Subject: [PATCH] make sure config tool can create a fresh ddraw.ini

---
 src/dllmain.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/dllmain.c b/src/dllmain.c
index c7a042f..ff55417 100644
--- a/src/dllmain.c
+++ b/src/dllmain.c
@@ -22,13 +22,15 @@ HMODULE g_ddraw_module;
 
 BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
 {
-    if (GetEnvironmentVariableW(L"cnc_ddraw_config_init", NULL, 0))
-        return TRUE;
-
     switch (dwReason)
     {
     case DLL_PROCESS_ATTACH:
     {
+        cfg_load();
+
+        if (GetEnvironmentVariableW(L"cnc_ddraw_config_init", NULL, 0))
+            return TRUE;
+
 #ifdef _DEBUG 
         dbg_init();
         TRACE("cnc-ddraw = %p\n", hDll);
@@ -104,14 +106,15 @@ BOOL WINAPI DllMain(HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
                 set_aware();
         }
 
-        cfg_load();
-
         timeBeginPeriod(1);
         hook_init(TRUE);
         break;
     }
     case DLL_PROCESS_DETACH:
     {
+        if (GetEnvironmentVariableW(L"cnc_ddraw_config_init", NULL, 0))
+            return TRUE;
+
         TRACE("cnc-ddraw DLL_PROCESS_DETACH\n");
 
         cfg_save();