Skip to content

Commit

Permalink
fix: crash when calling setProgressBar on macOS (backport: 4-0-x) (#1…
Browse files Browse the repository at this point in the history
…6727)

* fix: correctly check whether dock has progress bar

* fix: do not leak memory when setting dockTile
  • Loading branch information
trop[bot] authored and codebytere committed Feb 5, 2019
1 parent 0b7680a commit 8054fc8
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions atom/browser/native_window_mac.mm
Expand Up @@ -1118,17 +1118,23 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
const NativeWindow::ProgressState state) {
NSDockTile* dock_tile = [NSApp dockTile];

// Sometimes macOS would install a default contentView for dock, we must
// verify whether NSProgressIndicator has been installed.
bool first_time = !dock_tile.contentView ||
[[dock_tile.contentView subviews] count] == 0 ||
![[[dock_tile.contentView subviews] lastObject]
isKindOfClass:[NSProgressIndicator class]];

// For the first time API invoked, we need to create a ContentView in
// DockTile.
if (dock_tile.contentView == nullptr) {
NSImageView* image_view = [[NSImageView alloc] init];
if (first_time) {
NSImageView* image_view = [[[NSImageView alloc] init] autorelease];
[image_view setImage:[NSApp applicationIconImage]];
[dock_tile setContentView:image_view];
}

if ([[dock_tile.contentView subviews] count] == 0) {
NSProgressIndicator* progress_indicator = [[AtomProgressBar alloc]
initWithFrame:NSMakeRect(0.0f, 0.0f, dock_tile.size.width, 15.0)];
NSRect frame = NSMakeRect(0.0f, 0.0f, dock_tile.size.width, 15.0);
NSProgressIndicator* progress_indicator =
[[[AtomProgressBar alloc] initWithFrame:frame] autorelease];
[progress_indicator setStyle:NSProgressIndicatorBarStyle];
[progress_indicator setIndeterminate:NO];
[progress_indicator setBezeled:YES];
Expand All @@ -1139,7 +1145,7 @@ void ViewDidMoveToSuperview(NSView* self, SEL _cmd) {
}

NSProgressIndicator* progress_indicator = static_cast<NSProgressIndicator*>(
[[[dock_tile contentView] subviews] objectAtIndex:0]);
[[[dock_tile contentView] subviews] lastObject]);
if (progress < 0) {
[progress_indicator setHidden:YES];
} else if (progress > 1) {
Expand Down

0 comments on commit 8054fc8

Please sign in to comment.