mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Verify selectedIndex to prevent NSRangeException

Browse source
This commit is contained in:
Kevin Sawicki 2017-03-10 10:09:14 -08:00
parent 3b2faf7b89
commit 3349e32196
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/ui/cocoa/atom_touch_bar.mm
View file

@ -465,7 +465,8 @@ static NSTouchBarItemIdentifier SegmentedControlIdentifier = @"com.electron.touc
int selectedIndex = 0; int selectedIndex = 0;
settings.Get("selectedIndex", &selectedIndex); settings.Get("selectedIndex", &selectedIndex);
control.selectedSegment = selectedIndex; if (selectedIndex >= 0 && selectedIndex < control.segmentCount)
control.selectedSegment = selectedIndex;
} }
@end @end

5
spec/api-touch-bar-spec.js
View file

@ -45,8 +45,9 @@ describe('TouchBar module', function () {
new TouchBarSegmentedControl({ new TouchBarSegmentedControl({
segmentStyle: 'capsule', segmentStyle: 'capsule',
segments: [{label: 'baz', enabled: false}], segments: [{label: 'baz', enabled: false}],
selectedIndex: 0 selectedIndex: 5
}) }),
new TouchBarSegmentedControl({segments: []})
]) ])
window.setTouchBar(touchBar) window.setTouchBar(touchBar)
label.label = 'baz' label.label = 'baz'