fix: keep default system tray icon when the custom icon copy fails#1303
Open
LuisMIguelFurlanettoSousa wants to merge 1 commit into
Open
Conversation
mergeIcons assigned trayIconPath (-> system_tray_path) to the custom icon path BEFORE running fsExtra.copy, and discarded the result of the fsExtra.pathExists check. So a missing source or a failing copy left the config pointing at a png/<name> file that was never written, while the catch told the user the default 'will remain unchanged'. Use the existence check to keep the default (with a clear 'not found' message) and assign trayIconPath only after the copy succeeds, making the warning truthful.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #1302
What
mergeIconssettrayIconPath(→system_tray_path) to the custom icon path beforefsExtra.copy, and discarded the result offsExtra.pathExists. A missing source or a failing copy left the config pointing at apng/<name>file that was never written, while thecatchtold the user the default "will remain unchanged".Change
fsExtra.pathExistscheck: a missing source now keeps the default with a clear "not found" message.trayIconPathonly after a successfulfsExtra.copy, so a failed copy genuinely keeps the default (the existingcatchwarning is now truthful).dist/cli.jsrebuilt.Note on testing
mergeIconsis module-internal (not exported) and does file I/O, so it isn't unit-testable without a refactor; the change is a small, self-evident reordering plus using an already-present check. Verified by type-check + the full suite staying green.Verify
pnpm run cli:build && npx vitest run205 passed;
pnpm run format:checkclean.