Merge remote-tracking branch 'origin/master' into ui_rework_4_0

This commit is contained in:
Lipu Fei 2018-12-04 11:38:47 +01:00
commit 0d086008ae
5 changed files with 8 additions and 19 deletions

View file

@ -115,15 +115,16 @@ UM.PreferencesPage
currentIndex:
{
var idx = -1;
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
{
if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
{
currentIndex = i;
return;
idx = i;
break;
}
}
return -1
return idx;
}
onActivated: