Changeset 1427

Timestamp:

Jun 7, 2009, 9:42:16 PM (16 years ago)

Author:

Gregg Young

Message:

Fix IDM_BLINK to not leave a DataBar on the screen when fDataMin is TRUE. (Ticket 364) Remove unused variable from stubbyscan struct

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• mainwnd.c (modified) (1 diff)

trunk/dll/filldir.c

@@ -132 +132 @@
   HWND        hwndCnr;                  // hwnd you want the message posted to
   HWND        hwndDrivesList;
-  BOOL        RamDrive;
+  //BOOL        RamDrive;
 }
 STUBBYSCAN;
@@ -1703 +1703 @@
       stubbyScan->hwndCnr = hwndCnr;
       stubbyScan->hwndDrivesList = hwndDrivesList;
-      stubbyScan->RamDrive = FALSE;
+      //stubbyScan->RamDrive = FALSE;
       pciNext = (PCNRITEM) WinSendMsg(hwndCnr,
                                       CM_QUERYRECORD,
@@ -1716 +1716 @@
               (!fNoRemovableScan || ~flags & DRIVE_REMOVABLE)) //&& !fDrivetoSkip[drvNum])
           {
-            if (DRIVE_RAMDISK)
-              stubbyScan->RamDrive = TRUE;
+            //if (DRIVE_RAMDISK)
+            //  stubbyScan->RamDrive = TRUE;
             if (xbeginthread(StubbyScanThread,
                              65536,

trunk/dll/mainwnd.c

@@ -4693 +4693 @@
 
   case IDM_BLINK:
-    WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
-                    SWP_MINIMIZE);
-    WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
-                    SWP_RESTORE | SWP_ZORDER);
-    break;
+    {
+      BOOL changed = FALSE;
+
+      if (fDataMin) {
+        fDataMin = FALSE;
+        changed = TRUE;
+      }
+      WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
+                      SWP_MINIMIZE);
+      WinSetWindowPos(WinQueryWindow(hwnd, QW_PARENT), HWND_TOP, 0, 0, 0, 0,
+                      SWP_RESTORE | SWP_ZORDER);
+      if (changed)
+        fDataMin = TRUE;
+      break;
+    }
 
   case DID_CANCEL: