Merge branch 'devel'

Argent77 · Jun 10, 2023 · 1207fcf · 1207fcf
2 parents 9d4d21d + 13c6135
commit 1207fcf
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/src/org/infinity/NearInfinity.java b/src/org/infinity/NearInfinity.java
@@ -358,6 +358,7 @@ private NearInfinity(Options options) {
 
     final BrowserMenuBar menu = new BrowserMenuBar();
     menu.setUpdateMenuEnabled(options.isUpdateEnabled());
+    menu.setLaunchGameMenuEnabled(options.isLaunchGameVisible());
     // Registers menu as key event dispatcher to intercept Ctrl+Shift+D from any window
     KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(menu);
     setJMenuBar(menu);

diff --git a/src/org/infinity/gui/BrowserMenuBar.java b/src/org/infinity/gui/BrowserMenuBar.java
@@ -117,7 +117,7 @@
 import org.infinity.util.tuples.Couple;
 
 public final class BrowserMenuBar extends JMenuBar implements KeyEventDispatcher {
-  public static final String VERSION = "v2.3-20230609";
+  public static final String VERSION = "v2.3-20230610";
 
   public static final LookAndFeelInfo DEFAULT_LOOKFEEL =
       new LookAndFeelInfo("Metal", "javax.swing.plaf.metal.MetalLookAndFeel");
@@ -281,6 +281,11 @@ public void setUpdateMenuEnabled(boolean enable) {
     helpMenu.setUpdateMenuEnabled(enable);
   }
 
+  /** Specifies the enabled state of the "Allow launching games" entry in the Options menu. */
+  public void setLaunchGameMenuEnabled(boolean enable) {
+    optionsMenu.optionLaunchGameAllowed.setEnabled(enable);
+  }
+
   /**
    * Returns whether menu item "Tools > Print debug info" is shown.
    */

diff --git a/src/org/infinity/updater/Utils.java b/src/org/infinity/updater/Utils.java
@@ -89,8 +89,14 @@ public class Utils {
    * </p>
    *
    * @param s String containing date/time information.
+   * @return {@code OffsetDateTime} object of the given date string. Returns the current date if {@code null} is
+   * specified.
    */
   public static OffsetDateTime getDateTimeFromString(String s) throws DateTimeParseException {
+    if (s == null || s.isEmpty()) {
+      return OffsetDateTime.now();
+    }
+
     DateTimeParseException exception = null;
     final DateTimeFormatter[] formatters = {
         ISO_DATE_TIME,