github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-25 23:38:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

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
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;
settings.Get("selectedIndex", &selectedIndex);
control.selectedSegment = selectedIndex;
if (selectedIndex >= 0 && selectedIndex < control.segmentCount)
control.selectedSegment = selectedIndex;
}
@end

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

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