From a5142ec3113a44ee8253a3c314c7c5246eb9d273 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Sun, 21 Oct 2001 09:25:29 +0000 Subject: [PATCH] Initialize perl before fe_common_core_finish_init() or sending "irssi init finished". This way if /LOAD perl is in startup-file we don't load it twice. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1870 dbcabf3a-b0e7-0310-adc4-f8d773084564 --- src/fe-none/irssi.c | 4 ++-- src/fe-text/irssi.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fe-none/irssi.c b/src/fe-none/irssi.c index 2922a00c..eee24365 100644 --- a/src/fe-none/irssi.c +++ b/src/fe-none/irssi.c @@ -67,11 +67,11 @@ void noui_init(void) signal_add("reload", (SIGNAL_FUNC) sig_reload); signal_add("gui exit", (SIGNAL_FUNC) sig_exit); - signal_emit("irssi init finished", 0); - #ifdef HAVE_STATIC_PERL perl_core_init(); #endif + + signal_emit("irssi init finished", 0); } void noui_deinit(void) diff --git a/src/fe-text/irssi.c b/src/fe-text/irssi.c index 900fcf8c..88c47c5d 100644 --- a/src/fe-text/irssi.c +++ b/src/fe-text/irssi.c @@ -135,15 +135,15 @@ static void textui_finish_init(void) settings_check(); module_register("core", "fe-text"); - fe_common_core_finish_init(); - - signal_emit("irssi init finished", 0); - #ifdef HAVE_STATIC_PERL perl_core_init(); fe_perl_init(); #endif + fe_common_core_finish_init(); + + signal_emit("irssi init finished", 0); + if (display_firsttimer) { printtext_window(active_win, MSGLEVEL_CLIENTNOTICE, "%s", firsttimer_text);