Changeset 18732 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-05-17T23:01:34+02:00 (18 months ago)

Author:

taylor.smock

Message:

Fix #22908: Search button's dropdown list not initialized on JOSM launch (patch by gaben, modified)

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -73 +73 @@
 
     static {
+        // Load the history on initial load (for the drop-down dialog)
+        loadPrefs();
         SearchCompiler.addMatchFactory(new SimpleMatchFactory() {
             @Override
@@ -186 +188 @@
      */
     public static void search() {
-        prefs.load("search.history");
+        // Load the prefs, just in case someone fiddled with the preference value
+        loadPrefs();
         SearchSetting se = showSearchDialog(lastSearch);
         if (se != null) {
             searchWithHistory(se);
         }
+    }
+
+    /**
+     * Load preference values into the model
+     */
+    private static void loadPrefs() {
+        prefs.load("search.history");
     }