fix: remove label/image from segment if they are mutated to undefined…

…/null (#17334)
electron · Mar 12, 2019 · 6a93200 · 6a93200
1 parent 2f31302
commit 6a93200
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/atom/browser/ui/cocoa/atom_touch_bar.mm b/atom/browser/ui/cocoa/atom_touch_bar.mm
@@ -623,9 +623,14 @@ - (void)updateSegmentedControl:(NSCustomTouchBarItem*)item
     segments[i].Get("enabled", &enabled);
     if (segments[i].Get("label", &label)) {
       [control setLabel:base::SysUTF8ToNSString(label) forSegment:i];
-    } else if (segments[i].Get("icon", &image)) {
+    } else {
+      [control setLabel:@"" forSegment:i];
+    }
+    if (segments[i].Get("icon", &image)) {
       [control setImage:image.AsNSImage() forSegment:i];
       [control setImageScaling:NSImageScaleProportionallyUpOrDown forSegment:i];
+    } else {
+      [control setImage:nil forSegment:i];
     }
     [control setEnabled:enabled forSegment:i];
   }