From 870bf8c1f8d1ada547dc1482b39746791b28a0ee Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Wed, 9 Nov 2022 15:02:02 -0500 Subject: [PATCH] fix: `app.dock.setIcon()` crash before app ready (#36292) fix: dock.setIcon() crash before app ready Co-authored-by: Shelley Vohr Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- shell/browser/browser_mac.mm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/shell/browser/browser_mac.mm b/shell/browser/browser_mac.mm index 1853c77714244..9c42648b998e9 100644 --- a/shell/browser/browser_mac.mm +++ b/shell/browser/browser_mac.mm @@ -444,6 +444,13 @@ image = native_image->image(); } + // This is needed when this fn is called before the browser + // process is ready, since supported scales are normally set + // by ui::ResourceBundle::InitSharedInstance + // during browser process startup. + if (!is_ready()) + gfx::ImageSkia::SetSupportedScales({1.0f}); + [[AtomApplication sharedApplication] setApplicationIconImage:image.AsNSImage()]; }