[IZPACK-1775] Invoke refreshShortcutData() first (izpack#964)

Signed-off-by: Patrick Reinhart <patrick@reini.net>
reinhapa · Sep 11, 2024 · 57a0f8e · 57a0f8e
1 parent ec0dac1
commit 57a0f8e
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/...panel/src/main/java/com/izforge/izpack/panels/shortcut/ShortcutPanelAutomationHelper.java b/...panel/src/main/java/com/izforge/izpack/panels/shortcut/ShortcutPanelAutomationHelper.java
@@ -40,7 +40,6 @@
  * installation.
  *
  * @author Marc Eppelmann (marc.eppelmann&#064;gmx.de)
- * @version $Revision: 1540 $
  */
 public class ShortcutPanelAutomationHelper extends PanelAutomationHelper implements PanelAutomation
 {
@@ -61,9 +60,10 @@ public ShortcutPanelAutomationHelper(AutomatedInstallData installData, Resources
                                          UninstallData uninstallData, Housekeeper housekeeper, TargetFactory factory,
                                          InstallerListeners listeners, PlatformModelMatcher matcher) throws Exception
     {
-        shortcutPanelLogic = new ShortcutPanelLogic(installData, resources, uninstallData,
-                                                    housekeeper, factory, listeners, matcher);
+        this(new ShortcutPanelLogic(installData, resources, uninstallData,
+                                                    housekeeper, factory, listeners, matcher));
     }
+
     public ShortcutPanelAutomationHelper(ShortcutPanelLogic shortcutPanelLogic) throws Exception
     {
         this.shortcutPanelLogic = shortcutPanelLogic;
@@ -88,18 +88,18 @@ public void createInstallationRecord(InstallData installData, IXMLElement panelR
     @Override
     public void runAutomated(InstallData installData, IXMLElement panelRoot)
     {
-        shortcutPanelLogic.setAutoinstallXMLData(panelRoot);
-        if (shortcutPanelLogic.isCreateShortcutsImmediately())
+        try
         {
-            try
+            shortcutPanelLogic.refreshShortcutData();
+            shortcutPanelLogic.setAutoinstallXMLData(panelRoot);
+            if (shortcutPanelLogic.isCreateShortcutsImmediately())
             {
-                shortcutPanelLogic.refreshShortcutData();
                 shortcutPanelLogic.createAndRegisterShortcuts();
             }
-            catch (Exception e)
-            {
-                // ignore exception
-            }
+        }
+        catch (Exception e)
+        {
+            // ignore exception
         }
     }