From 4890358e436dfc50df127da75c4b6d5688701f0d Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 8 Jan 2013 10:14:54 +0000 Subject: [PATCH] backport previous wallpaper commit SVN revision: 82400 --- ChangeLog | 3 ++- NEWS | 1 + src/modules/conf_theme/e_int_config_wallpaper.c | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 84017b508..122893559 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ -2013-01-07 Mike Blumenkrantz +2013-01-08 Mike Blumenkrantz * Fixed bug where keyboard resizing of windows would not be possible if timeout was set to zero + * Fixed crash when clicking apply in wallpaper settings dialog and no wallpaper is selected 2013-01-07 Tom "TAsn" Hacohen * e_entry + e_scrollable: Fixed issues with smart members. diff --git a/NEWS b/NEWS index 1d3ee3be5..c7c03c498 100644 --- a/NEWS +++ b/NEWS @@ -20,3 +20,4 @@ Fixes: * Restore default keybindings no longer restores two bindings for ctrl+alt+f * entry/scrollframe: Fixed issues with submembers. * Fixed bug where keyboard resizing of windows would not be possible if timeout was set to zero + * Fixed crash when clicking apply in wallpaper settings dialog and no wallpaper is selected diff --git a/src/modules/conf_theme/e_int_config_wallpaper.c b/src/modules/conf_theme/e_int_config_wallpaper.c index 3ace5a474..b49b0ce27 100644 --- a/src/modules/conf_theme/e_int_config_wallpaper.c +++ b/src/modules/conf_theme/e_int_config_wallpaper.c @@ -514,6 +514,7 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata) { E_Config_Wallpaper *cw; + if (!cfdata->bg) return 0; cw = cfd->data; if (!eina_str_has_extension(cfdata->bg, ".edj")) {