Commit 04c5cf2f authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Merge branch 'neosilky-memleak'

parents 833ed262 1db31493

src/wallpaper.c

+8 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled, 
		Atom prop_root, prop_esetroot, type;

		int format, i;

		unsigned long length, after;

		unsigned char *data_root, *data_esetroot;

		unsigned char *data_root = NULL, *data_esetroot = NULL;

		Pixmap pmap_d1, pmap_d2;

		gib_list *l;
@@ -550,6 +550,13 @@ void feh_wm_set_bg(char *fil, Imlib_Image im, int centered, int scaled, 
				}

			}

		}



		if (data_root)

			XFree(data_root);

	

		if (data_esetroot)

			XFree(data_esetroot);



		/* This will locate the property, creating it if it doesn't exist */

		prop_root = XInternAtom(disp2, "_XROOTPMAP_ID", False);

		prop_esetroot = XInternAtom(disp2, "ESETROOT_PMAP_ID", False);