summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2005-12-11 13:59:50 +0000
committerSebastien Helleu <flashcode@flashtux.org>2005-12-11 13:59:50 +0000
commit54baad1848c14870b8d159b4f9620434def4d673 (patch)
tree14450b5236297dbefe429d8f7093172c2da9a571
parent11da868d70a2ef23d49bc9595ac8faa2df502ffe (diff)
downloadweechat-54baad1848c14870b8d159b4f9620434def4d673.zip
After a /upgrade, load session before plugins
-rw-r--r--src/common/weechat.c7
-rw-r--r--weechat/src/common/weechat.c7
2 files changed, 6 insertions, 8 deletions
diff --git a/src/common/weechat.c b/src/common/weechat.c
index d9f834853..27fb267f2 100644
--- a/src/common/weechat.c
+++ b/src/common/weechat.c
@@ -970,16 +970,15 @@ main (int argc, char *argv[])
utf8_init (); /* init UTF-8 in WeeChat */
gui_init (); /* init WeeChat interface */
weechat_welcome_message (); /* display WeeChat welcome message */
+ fifo_create (); /* FIFO pipe for remote control */
+ if (weechat_session)
+ session_load (weechat_session); /* load previous session if asked */
#ifdef PLUGINS
plugin_init (auto_load_plugins); /* init plugin interface(s) */
#endif
server_auto_connect (auto_connect, /* auto-connect to servers */
server_cmd_line);
- fifo_create (); /* FIFO pipe for remote control */
-
- if (weechat_session)
- session_load (weechat_session); /* load previous session if asked */
gui_main_loop (); /* WeeChat main loop */
diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c
index d9f834853..27fb267f2 100644
--- a/weechat/src/common/weechat.c
+++ b/weechat/src/common/weechat.c
@@ -970,16 +970,15 @@ main (int argc, char *argv[])
utf8_init (); /* init UTF-8 in WeeChat */
gui_init (); /* init WeeChat interface */
weechat_welcome_message (); /* display WeeChat welcome message */
+ fifo_create (); /* FIFO pipe for remote control */
+ if (weechat_session)
+ session_load (weechat_session); /* load previous session if asked */
#ifdef PLUGINS
plugin_init (auto_load_plugins); /* init plugin interface(s) */
#endif
server_auto_connect (auto_connect, /* auto-connect to servers */
server_cmd_line);
- fifo_create (); /* FIFO pipe for remote control */
-
- if (weechat_session)
- session_load (weechat_session); /* load previous session if asked */
gui_main_loop (); /* WeeChat main loop */