Changeset 1811 for trunk/dll/shadow.c

Timestamp:

Jun 14, 2015, 12:22:59 AM (10 years ago)

Author:

Gregg Young

Message:

Fix failure to generate multiple real objects

File:

• trunk/dll/shadow.c (modified) (4 diffs)

trunk/dll/shadow.c

@@ -20 +20 @@
                 menu item on a jar file.
   23 May 15 GKY Option to restart desktop to prevent icon loss from JAVA object
+  13 Jun 15 GKY Fix failure to generate multiple real objects
 
 ***********************************************************************/
@@ -257 +258 @@
   FILESTATUS3 fsa;
   BOOL JAVA = FALSE;
+  BOOL fJavaMade = FALSE;
 
   *szBuff = 0;
@@ -335 +337 @@
         else if (JAVA) {
           if (CreateJAVAProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr)) {
-            ULONG ulResult;
-
             apt |= FAPPTYP_BOUND;
-            ulResult = saymsg(MB_OKCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
-                              GetPString(IDS_RESTARTDESKTOP),
-                              GetPString(IDS_SETTINGLOSEICON));
-            if (ulResult == MBID_OK){
-              WinRestartWorkplace();
-            }
+            fJavaMade = TRUE;
           }
         }
@@ -353 +348 @@
           CreateProgramObject(p, (obj) ? szBuffer : NULL, szDir, cnr);
       }
+      JAVA = FALSE;
       x++;
       DosSleep(1);
+    } //while
+    if (fJavaMade) {
+      ULONG ulResult;
+
+      ulResult = saymsg(MB_OKCANCEL | MB_ICONQUESTION | MB_DEFBUTTON1, HWND_DESKTOP,
+                        GetPString(IDS_RESTARTDESKTOP),
+                        GetPString(IDS_SETTINGLOSEICON));
+      if (ulResult == MBID_OK)
+        WinRestartWorkplace();
     }
   }