Merge pull request #1135 from rwf-rr/fix-for-pr-1045

sweiland-openrails · web-flow · commit 196d83e863e6 · 2025-07-09T19:17:17.000+02:00
Fix bug in PR 1045: load any activity from JSON.
diff --git a/Source/Menu/MainForm.cs b/Source/Menu/MainForm.cs
@@ -1389,10 +1389,9 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
             }
             else
             {
-                // when explore-in-activity mode, try the content route info
+                // try the content route info
                 var routes = Settings.Content.ContentRouteSettings.Routes;
-                if ((SelectedActivity != null && SelectedActivity is ExploreThroughActivity) &&
-                    (SelectedFolder != null && routes.ContainsKey(SelectedFolder.Name) && routes[SelectedFolder.Name].Installed) &&
+                if ((SelectedFolder != null && routes.ContainsKey(SelectedFolder.Name) && routes[SelectedFolder.Name].Installed) &&
                     (!string.IsNullOrEmpty(routes[SelectedFolder.Name].Start.Route)))
                 {
                     var route = routes[SelectedFolder.Name];

Original file line number	Diff line number	Diff line change
`@@ -1389,10 +1389,9 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn`
`1389`	`1389`	`}`
`1390`	`1390`	`else`
`1391`	`1391`	`{`
`1392`		`- // when explore-in-activity mode, try the content route info`
	`1392`	`+ // try the content route info`
`1393`	`1393`	`var routes = Settings.Content.ContentRouteSettings.Routes;`
`1394`		`- if ((SelectedActivity != null && SelectedActivity is ExploreThroughActivity) &&`
`1395`		`- (SelectedFolder != null && routes.ContainsKey(SelectedFolder.Name) && routes[SelectedFolder.Name].Installed) &&`
	`1394`	`+ if ((SelectedFolder != null && routes.ContainsKey(SelectedFolder.Name) && routes[SelectedFolder.Name].Installed) &&`
`1396`	`1395`	`(!string.IsNullOrEmpty(routes[SelectedFolder.Name].Start.Route)))`
`1397`	`1396`	`{`
`1398`	`1397`	`var route = routes[SelectedFolder.Name];`