From 31899139e4314d67d0e5f011a9a0d896e514b8c7 Mon Sep 17 00:00:00 2001
From: Raphael Khaiat <raphael@khaiat.org>
Date: Tue, 16 Nov 2010 23:13:47 +0100
Subject: [PATCH] Revert "Reload wmfs with exact same argument as it has been
 launched instead of"

This reverts commit 61a1e18a598402397478748357d9c447e5c545f6.
---
 src/wmfs.c | 9 ++++-----
 src/wmfs.h | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/wmfs.c b/src/wmfs.c
index b5f0587..cdbb923 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -281,9 +281,10 @@ uicb_reload(uicb_t cmd)
      quit();
 
      for(; argv_global[0] && argv_global[0] == ' '; ++argv_global);
-     
-     execvp(argv_global, all_argv);
-    
+
+     // add -C to always load the same config file
+     execlp(argv_global, argv_global, "-C", conf.confpath, NULL);
+
      return;
 }
 
@@ -417,8 +418,6 @@ main(int argc, char **argv)
      char *ol = "csgVS";
 
      argv_global  = _strdup(argv[0]);
-     all_argv = argv;
-
      sprintf(conf.confpath, "%s/"DEF_CONF, getenv("HOME"));
 
      while((i = getopt(argc, argv, "hviSc:s:g:C:V:")) != -1)
diff --git a/src/wmfs.h b/src/wmfs.h
index 6b0f4d3..d6c88b9 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -440,7 +440,6 @@ XRectangle *sgeo;
 XRectangle *spgeo;
 Cursor cursor[CurLast];
 char *argv_global;
-char **all_argv;
 int xrandr_event;
 uint timing;