enlightenment/terminology
enlightenment
/
terminology
9
6
Fork 7
Code Issues 7 Pull Requests Projects Releases Wiki Activity

main: fix "temporary" issue

This commit is contained in:
Boris Faure 2021-07-12 23:22:43 +02:00
parent a4ba08b8df
commit 81eb162afd
Signed by: borisfaure
GPG Key ID: 35C0410516166BE8
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/main.c
View File

@ -125,7 +125,6 @@ _configure_instance(Ipc_Instance *inst)
inst->config->login_shell = inst->login_shell; inst->config->login_shell = inst->login_shell;
inst->config->temporary = EINA_TRUE; inst->config->temporary = EINA_TRUE;
} }
inst->login_shell = inst->config->login_shell;
if (inst->xterm_256color) if (inst->xterm_256color)
{ {
@ -334,7 +333,8 @@ main_ipc_new(Ipc_Instance *inst)
nargv[i++] = "-g"; nargv[i++] = "-g";
nargv[i++] = geom; nargv[i++] = geom;
} }
if (inst->login_shell) if ((inst->login_shell != IPC_INSTANCE_OPT_UNSET)
&& (inst->login_shell != 0))
{ {
nargv[i++] = "-l"; nargv[i++] = "-l";
} }
@ -370,7 +370,8 @@ main_ipc_new(Ipc_Instance *inst)
{ {
nargv[i++] = "-2"; nargv[i++] = "-2";
} }
if (inst->active_links) if ((inst->active_links != IPC_INSTANCE_OPT_UNSET)
&& (inst->active_links != 0))
{ {
nargv[i++] = "--active-links"; nargv[i++] = "--active-links";
} }
@ -379,15 +380,18 @@ main_ipc_new(Ipc_Instance *inst)
nargv[i++] = "-e"; nargv[i++] = "-e";
nargv[i++] = (char *)inst->cmd; nargv[i++] = (char *)inst->cmd;
} }
if (inst->video_mute) if ((inst->video_mute != IPC_INSTANCE_OPT_UNSET)
&& (inst->video_mute != 0))
{ {
nargv[i++] = "-m"; nargv[i++] = "-m";
} }
if (inst->cursor_blink) if ((inst->cursor_blink != IPC_INSTANCE_OPT_UNSET)
&& (inst->cursor_blink != 0))
{ {
nargv[i++] = "-c"; nargv[i++] = "-c";
} }
if (inst->visual_bell) if ((inst->visual_bell != IPC_INSTANCE_OPT_UNSET)
&& (inst->visual_bell != 0))
{ {
nargv[i++] = "-G"; nargv[i++] = "-G";
} }
@ -801,6 +805,7 @@ exit:
return EINA_TRUE; return EINA_TRUE;
} }
EAPI_MAIN int EAPI_MAIN int
elm_main(int argc, char **argv) elm_main(int argc, char **argv)
{ {