Merge pull request #3761 from ControlSystemStudio/bundled_settings

kasemir · web-flow · commit 5949b94302a4 · 2026-04-01T11:19:34.000-04:00
Launcher: Fix loading bundled settings
diff --git a/core/launcher/src/main/java/org/phoebus/product/Launcher.java b/core/launcher/src/main/java/org/phoebus/product/Launcher.java
@@ -100,7 +100,7 @@ public static void main(final String[] original_args) throws Exception {
         if (siteSettings.canRead())
         {
             logger.info("Loading bundled settings from " + siteSettings.getAbsolutePath());
-            loadSettings(siteSettings.getName());
+            loadSettings(siteSettings.getAbsolutePath());
         }
 
         // Handle arguments, potentially not even starting the UI

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public static void main(final String[] original_args) throws Exception {`
`100`	`100`	`if (siteSettings.canRead())`
`101`	`101`	`{`
`102`	`102`	`logger.info("Loading bundled settings from " + siteSettings.getAbsolutePath());`
`103`		`- loadSettings(siteSettings.getName());`
	`103`	`+ loadSettings(siteSettings.getAbsolutePath());`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`// Handle arguments, potentially not even starting the UI`