forked from enlightenment/edi
main: parsing command-line options.
Exit rather than shutdown if displaying --help or --copyright etc. @fix T6115
This commit is contained in:
parent
543de0a53e
commit
a1be071c4c
|
@ -39,7 +39,7 @@ typedef struct _Edi_Panel_Slide_Effect
|
||||||
Eina_Bool left;
|
Eina_Bool left;
|
||||||
} Edi_Panel_Slide_Effect;
|
} Edi_Panel_Slide_Effect;
|
||||||
|
|
||||||
#define COPYRIGHT "Copyright © 2014-2015 Andy Williams <andy@andyilliams.me> and various contributors (see AUTHORS)."
|
#define COPYRIGHT "Copyright © 2014-2017 Andy Williams <andy@andyilliams.me> and various contributors (see AUTHORS)."
|
||||||
|
|
||||||
static Evas_Object *_edi_toolbar, *_edi_leftpanes, *_edi_bottompanes;
|
static Evas_Object *_edi_toolbar, *_edi_leftpanes, *_edi_bottompanes;
|
||||||
static Evas_Object *_edi_logpanel, *_edi_consolepanel, *_edi_testpanel, *_edi_searchpanel, *_edi_taskspanel, *_edi_debugpanel;
|
static Evas_Object *_edi_logpanel, *_edi_consolepanel, *_edi_testpanel, *_edi_searchpanel, *_edi_taskspanel, *_edi_debugpanel;
|
||||||
|
@ -1604,15 +1604,15 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
|
||||||
goto end;
|
goto end;
|
||||||
|
|
||||||
args = ecore_getopt_parse(&optdesc, values, argc, argv);
|
args = ecore_getopt_parse(&optdesc, values, argc, argv);
|
||||||
if (args < 0)
|
if (quit_option)
|
||||||
|
{
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
else if (args < 0)
|
||||||
{
|
{
|
||||||
CRIT("Could not parse arguments.");
|
CRIT("Could not parse arguments.");
|
||||||
goto end;
|
goto end;
|
||||||
}
|
}
|
||||||
else if (quit_option)
|
|
||||||
{
|
|
||||||
goto end;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args < argc)
|
if (args < argc)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue