1 files changed, 19 insertions, 3 deletions

diff --git a/src/lib/eventloop.c b/src/lib/eventloop.c
index c6a9fd8f..de3c315a 100644
--- a/src/lib/eventloop.c
+++ b/src/lib/eventloop.c
@@ -828,6 +828,7 @@ run_main_loop (void *cls, char *const *args, const char *cfgfile,
   struct GNUNET_GTK_MainLoop *ml = cls;
   struct GNUNET_CONFIGURATION_Handle *gcfg;
   char *baseconfig;
+  char *ipath2;
   char *ipath;
   int argc;
 
@@ -838,16 +839,31 @@ run_main_loop (void *cls, char *const *args, const char *cfgfile,
   gtk_init (&argc, (char ***) &args);
   gcfg = GNUNET_CONFIGURATION_create ();
 
-  ipath = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR);
-  if (ipath == NULL)
+  if (NULL == (ipath = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_DATADIR)))
   {
     GNUNET_break (0);
     return;
   }
   GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
-  GNUNET_free (ipath);
   (void) GNUNET_CONFIGURATION_load_from (gcfg, baseconfig);
   GNUNET_free (baseconfig);
+
+  if (NULL == (ipath2 = GNUNET_GTK_installation_get_path (GNUNET_OS_IPK_DATADIR)))
+  {
+    GNUNET_break (0);
+    return;
+  }
+  if (0 != strcmp (ipath, ipath2))
+  {
+    GNUNET_asprintf (&baseconfig, "%s%s", ipath, "config.d");
+    if (GNUNET_YES ==
+        GNUNET_DISK_directory_test (baseconfig, GNUNET_YES))
+      (void) GNUNET_CONFIGURATION_load_from (gcfg, baseconfig);
+    GNUNET_free (baseconfig);
+  }
+  GNUNET_free (ipath2);
+  GNUNET_free (ipath);
+
   (void) GNUNET_CONFIGURATION_load (gcfg, cfgfile);
   ml->rs = GNUNET_NETWORK_fdset_create ();
   ml->ws = GNUNET_NETWORK_fdset_create ();