Changeset 724 for trunk/dll/collect.c

Timestamp:

Jul 6, 2007, 12:14:22 AM (18 years ago)

Author:

Steven Levine

Message:

CollectorCnrWndProc: just warn if busy

File:

• trunk/dll/collect.c (modified) (3 diffs)

trunk/dll/collect.c

@@ -36 +36 @@
   12 May 07 SHL Use dcd->ulItemsToUnHilite
   10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
+  05 Jul 07 SHL CollectorCnrWndProc: just warn if busy
 
 ***********************************************************************/
@@ -1708 +1709 @@
 
       case IDM_GREP:
-        if (dcd->amextracted)
-          Runtime_Error(pszSrcFile, __LINE__, "busy");
+        if (dcd->amextracted) {
+          saymsg(MB_OK | MB_ICONASTERISK,
+                 hwnd,
+                 GetPString(IDS_WARNINGTEXT),
+                 "Collector busy - please try again later");
+        }
         else {
           if (WinDlgBox(HWND_DESKTOP, hwnd, GrepDlgProc,
@@ -2256 +2261 @@
           ULONG action = UM_ACTION;
 
-          li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
-          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
+          li = DoFileDrop(hwnd, NULL, TRUE, mp1, mp2);
+          CheckPmDrgLimit(((PCNRDRAGINFO)mp2)->pDragInfo);
           if (li) {
             if (!*li->targetpath) {