Revert "Reload wmfs with exact same argument as it has been launched instead of"

This reverts commit 61a1e18a598402397478748357d9c447e5c545f6.
This commit is contained in:
Raphael Khaiat 2010-11-16 23:13:47 +01:00
parent 61a1e18a59
commit 31899139e4
2 changed files with 4 additions and 6 deletions

View File

@ -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)

View File

@ -440,7 +440,6 @@ XRectangle *sgeo;
XRectangle *spgeo;
Cursor cursor[CurLast];
char *argv_global;
char **all_argv;
int xrandr_event;
uint timing;