From c810ebf057acdc0cb9e8664d103931ad8a970ab3 Mon Sep 17 00:00:00 2001
From: Marcel Hollerbach <marcel-hollerbach@t-online.de>
Date: Tue, 13 May 2014 15:49:12 +0200
Subject: [PATCH] entrance: now the pools are set correctly.

---
 src/bin/entrance_gui.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 src/bin/entrance_gui.c

diff --git a/src/bin/entrance_gui.c b/src/bin/entrance_gui.c
old mode 100755
new mode 100644
index 17f61fa..714d1fe
--- a/src/bin/entrance_gui.c
+++ b/src/bin/entrance_gui.c
@@ -458,7 +458,7 @@ entrance_gui_xsessions_get(void)
 void
 entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
 {
-  if (_gui->background_pool)
+   if (_gui->background_pool && conf->background_pool)
      {
         Entrance_Image *img;
         EINA_LIST_FREE(_gui->background_pool, img)
@@ -467,9 +467,10 @@ entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
              eina_stringshare_del(img->group);
              free(img);
           }
-        _gui->background_pool = conf->background_pool;
      }
-   if (_gui->icon_pool)
+   if (conf->background_pool)
+     _gui->background_pool = conf->background_pool;
+   if (_gui->icon_pool && conf->icon_pool)
      {
         Entrance_Image *img;
         EINA_LIST_FREE(_gui->icon_pool, img)
@@ -478,8 +479,9 @@ entrance_gui_conf_set(const Entrance_Conf_Gui_Event *conf)
              eina_stringshare_del(img->group);
              free(img);
           }
-        _gui->icon_pool = conf->icon_pool;
      }
+   if (conf->icon_pool)
+     _gui->icon_pool = conf->icon_pool;
    if (_gui->bg.path != conf->bg.path)
      {
         if ((conf->bg.path) && (*conf->bg.path))