From 6a8cad6f9431a629129d74cd3c549d279d1dea5d Mon Sep 17 00:00:00 2001
From: Diogo Sousa <diogogsousa@gmail.com>
Date: Sun, 12 May 2013 16:37:38 +0100
Subject: [PATCH] Now hexchat doesn't abnormally terminal when started as root.

This fixes #589/#504.
---
 src/common/cfgfiles.c |  9 ---------
 src/common/hexchat.c  | 10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index a7949d3f..9b8d9e4c 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -827,15 +827,6 @@ load_config (void)
 
 	} else
 	{
-#ifndef WIN32
-#ifndef __EMX__
-		/* OS/2 uses UID 0 all the time */
-		if (getuid () == 0)
-			fe_message (_("* Running IRC as root is stupid! You should\n"
-							"  create a User Account and use that to login.\n"), FE_MSG_WARN|FE_MSG_WAIT);
-#endif
-#endif /* !WIN32 */
-
 		g_mkdir (prefs.hex_dcc_dir, 0700);
 		g_mkdir (prefs.hex_dcc_completed_dir, 0700);
 
diff --git a/src/common/hexchat.c b/src/common/hexchat.c
index 72b97e3a..b04c2675 100644
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@@ -1053,6 +1053,7 @@ main (int argc, char *argv[])
 #if ! GLIB_CHECK_VERSION (2, 36, 0)
 	g_type_init ();
 #endif
+
 	load_config ();
 
 #ifdef WIN32
@@ -1244,6 +1245,15 @@ main (int argc, char *argv[])
 
 	fe_init ();
 
+#ifndef WIN32
+#ifndef __EMX__
+	/* OS/2 uses UID 0 all the time */
+	if (getuid () == 0)
+		fe_message (_("* Running IRC as root is stupid! You should\n"
+			      "  create a User Account and use that to login.\n"), FE_MSG_WARN|FE_MSG_WAIT);
+#endif
+#endif /* !WIN32 */
+
 	xchat_init ();
 
 	fe_main ();