From 57a052bec790a15bbe434ba69635add882885c4b Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Sun, 22 Jun 2014 20:42:48 +0900 Subject: [PATCH] Revert "cleanup config use" This causes major segvs ith single instance multiple windows mode - every close of a window causes terminology to crash! This reverts commit 6cd6c87210c931542c9b7841e520d8f453557c4b. --- src/bin/main.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 8e84b7f0..94e8f049 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -2377,8 +2377,8 @@ main_ipc_new(Ipc_Instance *inst) { Win *wn; Term *term; - Split *sp; Config *config; + Split *sp; int pargc = 0, nargc, i; char **pargv = NULL, **nargv = NULL, geom[256]; @@ -2543,18 +2543,21 @@ main_ipc_new(Ipc_Instance *inst) nargv[i++] = "-e"; nargv[i++] = (char *)inst->cmd; } + config = config_fork(main_config); ecore_app_args_set(nargc, (const char **)nargv); wn = main_win_new(inst->name, inst->role, inst->title, inst->icon_name, - main_config, inst->fullscreen, inst->iconic, + config, inst->fullscreen, inst->iconic, inst->borderless, inst->override, inst->maximized); if (!wn) { ecore_app_args_set(pargc, (const char **)pargv); free(nargv); + config_del(config); return; } - config = wn->config; - + + config = config_fork(config); + unsetenv("DESKTOP_STARTUP_ID"); if (inst->background) {