1
0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00

Fix build after last change to option processing.

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4529 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Emanuele Giaquinta 2007-05-29 08:19:24 +00:00 committed by exg
parent 7c1a733535
commit 152acd26ec

View File

@ -49,17 +49,8 @@ static void sig_reload(void)
void noui_init(void) void noui_init(void)
{ {
static struct poptOption options[] = {
POPT_AUTOHELP
{ "load", 'l', POPT_ARG_STRING, &autoload_module, 0, "Module to load (default = bot)", "MODULE" },
{ NULL, '\0', 0, NULL }
};
srand(time(NULL)); srand(time(NULL));
autoload_module = NULL;
args_register(options);
irssi_gui = IRSSI_GUI_NONE; irssi_gui = IRSSI_GUI_NONE;
core_init(); core_init();
irc_init(); irc_init();
@ -90,13 +81,22 @@ void noui_deinit(void)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
core_init_paths(argc, argv); static struct poptOption options[] = {
POPT_AUTOHELP
{ "load", 'l', POPT_ARG_STRING, &autoload_module, 0, "Module to load (default = bot)", "MODULE" },
{ NULL, '\0', 0, NULL }
};
autoload_module = NULL;
core_register_options();
args_register(options);
args_execute(argc, argv);
core_preinit(argv[0]);
#ifdef HAVE_SOCKS #ifdef HAVE_SOCKS
SOCKSinit(argv[0]); SOCKSinit(argv[0]);
#endif #endif
noui_init(); noui_init();
args_execute(argc, argv);
if (autoload_module == NULL) if (autoload_module == NULL)
autoload_module = "bot"; autoload_module = "bot";