@@ -1397,33 +1397,21 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
1397
1397
{
1398
1398
SetToDefault ( comboBox , index , map , defaultValue ) ;
1399
1399
}
1400
+ else if ( index == UserSettings . Menu_SelectionIndex . Path && SelectedActivity != null && SelectedActivity is ExploreActivity )
1401
+ {
1402
+ // Is this ever called? Theoretically from ShowHeadToList(), but breakpoint was never hit.
1403
+ searchInComboBoxAndSet ( comboBoxStartAt , valueComboboxToSetTo ) ;
1404
+ searchInComboBoxAndSet ( comboBoxHeadTo , valueComboboxToSetTo ) ;
1405
+ }
1400
1406
else
1401
1407
{
1402
- bool found = false ;
1403
- if ( ( index != UserSettings . Menu_SelectionIndex . Path ) ||
1404
- ( SelectedActivity == null ) || ( ! ( SelectedActivity is ExploreActivity ) ) )
1408
+ if ( comboBox . DropDownStyle == ComboBoxStyle . DropDown )
1405
1409
{
1406
- if ( comboBox . DropDownStyle == ComboBoxStyle . DropDown )
1407
- {
1408
- comboBox . Text = valueComboboxToSetTo ;
1409
- found = true ;
1410
- }
1411
- else
1412
- {
1413
- found = searchInComboBox ( comboBox , valueComboboxToSetTo ) ;
1414
- }
1410
+ comboBox . Text = valueComboboxToSetTo ;
1415
1411
}
1416
1412
else
1417
1413
{
1418
- found = searchInComboBox ( comboBoxStartAt , valueComboboxToSetTo ) ;
1419
- found = searchInComboBox ( comboBoxHeadTo , valueComboboxToSetTo ) ;
1420
- }
1421
- if ( ! found )
1422
- {
1423
- if ( comboBox . Items . Count > 0 )
1424
- {
1425
- comboBox . SelectedIndex = 0 ;
1426
- }
1414
+ searchInComboBoxAndSet ( comboBox , valueComboboxToSetTo ) ;
1427
1415
}
1428
1416
}
1429
1417
}
@@ -1434,17 +1422,25 @@ void UpdateFromMenuSelection<T>(ComboBox comboBox, UserSettings.Menu_SelectionIn
1434
1422
}
1435
1423
}
1436
1424
1437
- bool searchInComboBox ( ComboBox comboBox , string valueComboboxToSetTo )
1425
+ /// <summary>
1426
+ /// Search the combobox for the specified value. When found, set the combobox to the value.
1427
+ /// When not found, set it to the first defined value.
1428
+ /// Leave empty when there are no defined values.
1429
+ /// </summary>
1430
+ void searchInComboBoxAndSet ( ComboBox comboBox , string valueComboboxToSetTo )
1438
1431
{
1439
1432
for ( var i = 0 ; i < comboBox . Items . Count ; i ++ )
1440
1433
{
1441
1434
if ( ( string ) comboBox . Items [ i ] . ToString ( ) == valueComboboxToSetTo )
1442
1435
{
1443
1436
comboBox . SelectedIndex = i ;
1444
- return true ;
1437
+ return ;
1445
1438
}
1446
1439
}
1447
- return false ;
1440
+ if ( comboBox . Items . Count > 0 )
1441
+ {
1442
+ comboBox . SelectedIndex = 0 ;
1443
+ }
1448
1444
}
1449
1445
1450
1446
void SetToDefault < T > ( ComboBox comboBox , UserSettings . Menu_SelectionIndex index , Func < T , string > map , T defaultValue )
0 commit comments