Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified apps/desktop/build/icon.icns
Binary file not shown.
Binary file modified apps/desktop/build/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 4 additions & 5 deletions apps/desktop/src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4143,11 +4143,10 @@ app.whenReady().then(async () => {
// dock picks up whatever the running binary advertises. During
// `npm run dev` that's Electron's default, so we force our own.
//
// The path has to come from windowIconPath(): build/ is not in the asar
// (`files` ships out/** only), the icon travels as an extraResource, and a
// packaged app resolving __dirname/../../build/icon.png just logged a failure
// on every launch.
if (isMac() && app.dock) {
// Dev only: a packaged app already advertises its bundle .icns, and
// setIcon would replace it with a raw NSImage, bypassing the system's
// icon treatment (#544 shipped an oversized dock tile this way).
if (isMac() && app.dock && !app.isPackaged) {
try {
app.dock.setIcon(windowIconPath())
} catch (err) {
Expand Down