summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-05-02 14:43:22 +0200
committerDaniel Friesel <derf@finalrewind.org>2016-05-02 14:43:22 +0200
commit715010427350902c845c88608bc118c6e5e37e44 (patch)
tree921011180cb7af77285f726d523caf5de8561f51 /src
parent833ed262dba9dcfcc056244937b0f4c9036b4477 (diff)
parent120410a4d1d6a7a9df4865301ec127c4f3acdd86 (diff)
Merge branch 'memleak' of https://github.com/neosilky/feh into neosilky-memleak
Diffstat (limited to 'src')
-rw-r--r--src/wallpaper.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/wallpaper.c b/src/wallpaper.c
index b6f2c0c..eb33a0c 100644
--- a/src/wallpaper.c
+++ b/src/wallpaper.c
@@ -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);