Changeset 1363

Timestamp:

Dec 29, 2008, 8:14:05 PM (17 years ago)

Author:

Gregg Young

Message:

Move the FillInDriveFlags call in init.c to after the ini file is fully initiated since it accesses it; Fix the black toolbar on new install issue (I think I removed the right ini entry to test this) Ticket 328

Location:

trunk/dll

Files:

• init.c (modified) (2 diffs)
• mainwnd.c (modified) (1 diff)

trunk/dll/init.c

@@ -762 +762 @@
   }
 
-  ArgDriveFlags(argc, argv);
-  FillInDriveFlags(NULL);
-
   if (!*profile)
     strcpy(profile, "FM3.INI");
@@ -987 +984 @@
     }
   }
+
+  ArgDriveFlags(argc, argv);
+  FillInDriveFlags(NULL);
 
   FindSwapperDat();

trunk/dll/mainwnd.c

@@ -2637 +2637 @@
       if (hps) {
         GpiCreateLogColorTable(hps, 0, LCOLF_RGB, 0, 0, NULL);
-        WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
-                          sizeof(lColor), &lColor, 0);
-        if (!lColor)
+        if (!(WinQueryPresParam(hwnd, PP_BACKGROUNDCOLOR, 0, NULL,
+                                sizeof(lColor), &lColor, 0)))
           lColor = CLR_PALEGRAY;
         WinQueryWindowRect(hwnd, &rcl);