gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

wIconChangeImageFile don't update without file

Browse Source 
The function wIconChangeImageFile mustn't update the icon if
no file is set.

This is a bug. To reproduce it:

1. Right click on dock icon. Select "Settings"
2. Erase the Icon Image contents (set empty)
3. Click "OK" -> Exit, no changes... no?
4. Right click on the same dock icon. Select "Settings"
5. Erase the Icon Image contents (set empty)
6. Click "OK" -> Crash

If wmaker don't crash, watch the file ~/GNUstep/Defaults/WMWindowAttributes,
the default icon ("*" has trash in the name). Probably something is not fine
at wIconUpdate.
This commit is contained in:
Rodolfo García Peñas (kix)
2012-10-31 22:44:17 +01:00
committed by Carlos R. Mafra
parent 280e1e099d
commit 156d8ebfa5
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/icon.c
View File

@@ -376,16 +376,14 @@ Bool wIconChangeImageFile(WIcon * icon, char *file)
char *path; char *path;
int error = 0; int error = 0;
if (!file)
return True;
if (icon->file_image) { if (icon->file_image) {
RReleaseImage(icon->file_image); RReleaseImage(icon->file_image);
icon->file_image = NULL; icon->file_image = NULL;
} }
if (!file) {
wIconUpdate(icon);
return True;
}
path = FindImage(wPreferences.icon_path, file); path = FindImage(wPreferences.icon_path, file);
if (path && (image = RLoadImage(scr->rcontext, path, 0))) { if (path && (image = RLoadImage(scr->rcontext, path, 0))) {