Fix tray icon when IconThemePath exists but is empty #365
Conversation
This file contains 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
|
I believe it's OK, as I use electron hardly ever. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
It seems that my change in #362 caused a different bug. My bad, I should have done more testing.
Now that the IconThemePath is updated in
item.py, sometimes it exists but is an empty string. The conditional intray.pychecks for empty strings in IconName and IconPixmap, but not IconThemePath, so I just added that check.The diff is larger because line 169 (currently 172) looked a bit messy after adding the condition, so I preferred extracting the check to a function. Feel free to inline it if you don't like nested functions.