Commit 38ef40ca authored by Jens Georg's avatar Jens Georg

Only fall-back to resource if not found

parent 6285ef5d
Pipeline #61700 passed with stage
in 20 minutes and 48 seconds
......@@ -1051,11 +1051,13 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
debug("Failed to find icon %s in theme, falling back to resources", name);
}
try {
var path = "/org/gnome/Shotwell/icons/%s".printf(name);
pixbuf = new Gdk.Pixbuf.from_resource(path);
} catch (Error err) {
critical("Unable to load icon %s: %s", name, err.message);
if (pixbuf == null) {
try {
var path = "/org/gnome/Shotwell/icons/%s".printf(name);
pixbuf = new Gdk.Pixbuf.from_resource(path);
} catch (Error err) {
critical("Unable to load icon %s: %s", name, err.message);
}
}
if (pixbuf == null)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment