Merge pull request #1366 from ashitsalesforce/master

make sure that menubar is displayed after upgrade dialog is closed
forcedotcom · Oct 29, 2024 · 6cf0a84 · 6cf0a84
2 parents 884634f + d83f828
commit 6cf0a84
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/main/java/com/salesforce/dataloader/ui/LoaderWindow.java b/src/main/java/com/salesforce/dataloader/ui/LoaderWindow.java
@@ -145,6 +145,7 @@ public void run() {
             displayUpgradeDialog(Display.getDefault());
         }
         setBlockOnOpen(true);
+        addMenuBar();
         open();
 
         Display currentDisplay = Display.getCurrent();
@@ -272,7 +273,6 @@ public void run() {
                 for (Entry<Integer, OperationUIAction> ent : map.entrySet()) {
                     if (result == ent.getKey()) ent.getValue().run();
                 }
-                addMenuBar();
             }
         });
     }
@@ -286,7 +286,6 @@ private void displayUpgradeDialog(final Display display) {
             public void run() {
                 LoaderUpgradeDialog dlg = new LoaderUpgradeDialog(display.getActiveShell(), controller);
                 dlg.open();
-                addMenuBar();
             }
         });
     }