Disable one instance code coz it's really buggy

This commit is contained in:
Berke Viktor 2012-11-11 15:50:31 +01:00
parent a04fdc50b6
commit 7911aeb51e
4 changed files with 9 additions and 5 deletions

View File

@ -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", 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_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_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_fav", P_OFFINT (hex_gui_slist_fav), TYPE_BOOL},
{"gui_slist_select", P_OFFINT (hex_gui_slist_select), TYPE_INT}, {"gui_slist_select", P_OFFINT (hex_gui_slist_select), TYPE_INT},
{"gui_slist_skip", P_OFFINT (hex_gui_slist_skip), TYPE_BOOL}, {"gui_slist_skip", P_OFFINT (hex_gui_slist_skip), TYPE_BOOL},

View File

@ -909,7 +909,7 @@ hexchat_execv (char * const argv[])
#endif #endif
} }
#ifdef WIN32 #if 0 /* def WIN32 */
static void static void
xchat_restore_window (HWND hexchat_window) xchat_restore_window (HWND hexchat_window)
{ {
@ -957,7 +957,7 @@ main (int argc, char *argv[])
#ifdef WIN32 #ifdef WIN32
char hexchat_lang[13]; /* LC_ALL= plus 5 chars of hex_gui_lang and trailing \0 */ char hexchat_lang[13]; /* LC_ALL= plus 5 chars of hex_gui_lang and trailing \0 */
HANDLE mutex; /* HANDLE mutex; */
#endif #endif
srand (time (0)); /* CL: do this only once! */ srand (time (0)); /* CL: do this only once! */
@ -1159,6 +1159,7 @@ main (int argc, char *argv[])
putenv (hexchat_lang); putenv (hexchat_lang);
#if 0
if (prefs.hex_gui_single && !portable_mode ()) if (prefs.hex_gui_single && !portable_mode ())
{ {
DWORD error; DWORD error;
@ -1184,6 +1185,7 @@ main (int argc, char *argv[])
} }
} }
#endif #endif
#endif
#ifdef SOCKS #ifdef SOCKS
SOCKSinit (argv[0]); SOCKSinit (argv[0]);
@ -1223,11 +1225,13 @@ main (int argc, char *argv[])
#ifdef WIN32 #ifdef WIN32
WSACleanup (); WSACleanup ();
#if 0
if (prefs.hex_gui_single && !portable_mode ()) if (prefs.hex_gui_single && !portable_mode ())
{ {
ReleaseMutex (mutex); ReleaseMutex (mutex);
CloseHandle (mutex); CloseHandle (mutex);
} }
#endif
#endif #endif
return 0; return 0;

View File

@ -139,7 +139,7 @@ struct hexchatprefs
unsigned int hex_gui_join_dialog; unsigned int hex_gui_join_dialog;
unsigned int hex_gui_mode_buttons; unsigned int hex_gui_mode_buttons;
unsigned int hex_gui_quit_dialog; 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_fav;
unsigned int hex_gui_slist_skip; unsigned int hex_gui_slist_skip;
unsigned int hex_gui_tab_chans; unsigned int hex_gui_tab_chans;

View File

@ -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_("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_("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_("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_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_HEADER, N_("Auto Open DCC Windows"),0,0,0},
{ST_TOGGLE, N_("Send window"), P_OFFINTNL(hex_gui_autoopen_send), 0, 0, 0}, {ST_TOGGLE, N_("Send window"), P_OFFINTNL(hex_gui_autoopen_send), 0, 0, 0},