From 7911aeb51e66e38d4c1721e2392188c1a58f53d6 Mon Sep 17 00:00:00 2001
From: Berke Viktor <bviktor@hexchat.org>
Date: Sun, 11 Nov 2012 15:50:31 +0100
Subject: Disable one instance code coz it's really buggy

---
 src/common/cfgfiles.c | 2 +-
 src/common/hexchat.c  | 8 ++++++--
 src/common/hexchat.h  | 2 +-
 src/fe-gtk/setup.c    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index dd31a541..8484845e 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -439,7 +439,7 @@ const struct prefs vars[] =
 	{"gui_pane_right_size", P_OFFINT (hex_gui_pane_right_size), TYPE_INT},
 	{"gui_pane_right_size_min", P_OFFINT (hex_gui_pane_right_size_min), TYPE_INT},
 	{"gui_quit_dialog", P_OFFINT (hex_gui_quit_dialog), TYPE_BOOL},
-	{"gui_single", P_OFFINT (hex_gui_single), TYPE_BOOL},
+	/* {"gui_single", P_OFFINT (hex_gui_single), TYPE_BOOL}, */
 	{"gui_slist_fav", P_OFFINT (hex_gui_slist_fav), TYPE_BOOL},
 	{"gui_slist_select", P_OFFINT (hex_gui_slist_select), TYPE_INT},
 	{"gui_slist_skip", P_OFFINT (hex_gui_slist_skip), TYPE_BOOL},
diff --git a/src/common/hexchat.c b/src/common/hexchat.c
index de6402ee..1aa5fe54 100644
--- a/src/common/hexchat.c
+++ b/src/common/hexchat.c
@@ -909,7 +909,7 @@ hexchat_execv (char * const argv[])
 #endif
 }
 
-#ifdef WIN32
+#if 0 /* def WIN32 */
 static void
 xchat_restore_window (HWND hexchat_window)
 {
@@ -957,7 +957,7 @@ main (int argc, char *argv[])
 
 #ifdef WIN32
 	char hexchat_lang[13];	/* LC_ALL= plus 5 chars of hex_gui_lang and trailing \0 */
-	HANDLE mutex;
+	/* HANDLE mutex; */
 #endif
 
 	srand (time (0));	/* CL: do this only once! */
@@ -1159,6 +1159,7 @@ main (int argc, char *argv[])
 
 	putenv (hexchat_lang);
 
+#if 0
 	if (prefs.hex_gui_single && !portable_mode ())
 	{
 		DWORD error;
@@ -1184,6 +1185,7 @@ main (int argc, char *argv[])
 		}
 	}
 #endif
+#endif
 
 #ifdef SOCKS
 	SOCKSinit (argv[0]);
@@ -1223,11 +1225,13 @@ main (int argc, char *argv[])
 #ifdef WIN32
 	WSACleanup ();
 
+#if 0
 	if (prefs.hex_gui_single && !portable_mode ())
 	{
 		ReleaseMutex (mutex);
 		CloseHandle (mutex);
 	}
+#endif
 #endif
 
 	return 0;
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 357bdad3..43597617 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -139,7 +139,7 @@ struct hexchatprefs
 	unsigned int hex_gui_join_dialog;
 	unsigned int hex_gui_mode_buttons;
 	unsigned int hex_gui_quit_dialog;
-	unsigned int hex_gui_single;
+	/* unsigned int hex_gui_single; */
 	unsigned int hex_gui_slist_fav;
 	unsigned int hex_gui_slist_skip;
 	unsigned int hex_gui_tab_chans;
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 2929834a..c572de8c 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -527,7 +527,7 @@ static const setting advanced_settings_oneinstance[] =
 	{ST_TOGGLE,	N_("Display MODEs in raw form"), P_OFFINTNL(hex_irc_raw_modes), 0, 0, 0},
 	{ST_TOGGLE,	N_("Whois on notify"), P_OFFINTNL(hex_notify_whois_online), N_("Sends a /WHOIS when a user comes online in your notify list."), 0, 0},
 	{ST_TOGGLE,	N_("Hide join and part messages"), P_OFFINTNL(hex_irc_conf_mode), N_("Hide channel join/part messages by default."), 0, 0},
-	{ST_TOGGLE,	N_("Allow only one instance of HexChat to run"), P_OFFINTNL(hex_gui_single), 0, 0, 0},
+	/* {ST_TOGGLE,	N_("Allow only one instance of HexChat to run"), P_OFFINTNL(hex_gui_single), 0, 0, 0}, */
 	{ST_TOGGLE,	N_("Display lists in compact mode"), P_OFFINTNL(hex_gui_compact), N_("Use less spacing between user list/channel tree rows."), 0, 0},
 	{ST_HEADER,	N_("Auto Open DCC Windows"),0,0,0},
 	{ST_TOGGLE, N_("Send window"), P_OFFINTNL(hex_gui_autoopen_send), 0, 0, 0},
-- 
cgit 1.4.1