This repository has been archived by the owner on Sep 2, 2021. It is now read-only.
Fix for loading the icon list in Linux #483
Open
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
This commit fixes a couple of things:
1. The list of icons was using relative paths.
2. If the icons could not be loaded, the error was ignored without a warning.
For adobe#1 I am prefixing the icon paths with the directory where the Brackets executable resides (since the icons are there, too).
One might think that the paths are relative to the aforementioned directory, except that is only true if Brackets is started from the launcher. If I start Brackets from the command line (or if I specify another initial working dir), Brackets fails to load the icons.
On top of that, no warning is issued to the user, making this hard to trace as my window manager cached the icons (so for testing I had to rename the executable, too). Which leads me to adobe#2, now I'm issuing a warning if Brackets fails to load any of the icons.
The bug was originally pointed out to me by another user - @orschiro on github.
|
This should fix adobe/brackets#7141 |
| GError *error = NULL; | ||
| std::string running_dir = AppGetRunningDirectory(); | ||
| gchar *iconpath = g_strdup_printf("%s/%s", running_dir.c_str(), icons[i].c_str()); | ||
| GdkPixbuf *icon = gdk_pixbuf_new_from_file(iconpath, &error); |
There was a problem hiding this comment.
Check if iconpath is NULL or not. If it is NULL continue.
|
@radorodopski Did you get a chance to look at the suggested changes? |
This was referenced Aug 30, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This commit fixes a couple of things:
1. The list of icons was using relative paths.
2. If the icons could not be loaded, the error was ignored without a warning.
For 1) I am prefixing the icon paths with the directory where the Brackets executable resides (since the icons are there, too).
One might think that the paths are relative to the aforementioned directory, except that is only true if Brackets is started from the launcher. If I start Brackets from the command line (or if I specify another initial working dir), Brackets fails to load the icons.
On top of that, no warning is issued to the user, making this hard to trace as my window manager cached the icons (so for testing I had to rename the executable, too). Which leads me to 2), now I'm issuing a warning if Brackets fails to load any of the icons.
The bug was originally pointed out to me by another user - @orschiro on github.
Here's what it looks like:
To reproduce the issue:
Running the copy of the Brackets executable from 4) is necessary in order to bypass any cache the window manager might have.