Skip to content

Commit bba93d3

Browse files
committed
Fix bug in PR 1045: load any activity from JSON.
The limit to explore-in-activity-mode was due to a misunderstanding from the discussion of PR 1045. Always load all the start data from the JSON. If it is an activity, the extra data (eg. Weather) will be ignored, as the data from the activity prevails. If it is explore (both) and data is missing, defaults will be used.
1 parent acd7144 commit bba93d3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

Source/Menu/MainForm.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1389,10 +1389,9 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
13891389
}
13901390
else
13911391
{
1392-
// when explore-in-activity mode, try the content route info
1392+
// try the content route info
13931393
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) &&
13961395
(!string.IsNullOrEmpty(routes[SelectedFolder.Name].Start.Route)))
13971396
{
13981397
var route = routes[SelectedFolder.Name];

0 commit comments

Comments
 (0)