stupid option removed from group chats according to results of voting

4 files changed, 1 insertions, 5 deletions

diff --git a/plugins/Scriver/src/chat_options.cpp b/plugins/Scriver/src/chat_options.cpp
index 6f6a664edc..9f19428273 100644
--- a/plugins/Scriver/src/chat_options.cpp
+++ b/plugins/Scriver/src/chat_options.cpp
@@ -42,7 +42,6 @@ static struct branch_t branch1[] = {
 	{ LPGENW("Show topic on your contact list (if supported)"), "TopicOnClist", 0, 0, nullptr },

 	{ LPGENW("Do not play sounds when focused"), "SoundsFocus", 0, 0, nullptr },

 	{ LPGENW("Do not pop up when joining"), "PopupOnJoin", 0, 0, nullptr },

-	{ LPGENW("Show and hide by double clicking in the contact list"), "ToggleVisibility", 0, 0, nullptr },

 	{ LPGENW("Show contact statuses (if supported)"), "ShowContactStatus", 0, 0, nullptr },

 	{ LPGENW("Display contact status icon before role icon"), "ContactStatusFirst", 0, 0, nullptr },

 	{ LPGENW("Add ':' to auto-completed names"), "AddColonToAutoComplete", 0, 1, nullptr }

diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp
index c53cfd235a..49d8027208 100644
--- a/plugins/TabSRMM/src/chat_options.cpp
+++ b/plugins/TabSRMM/src/chat_options.cpp
@@ -146,7 +146,6 @@ static branch_t branch1[] = {
 	{ LPGENW("Show button menus when right clicking the buttons"), "RightClickFilter", 0, 1, nullptr },

 	{ LPGENW("Show topic as status message on the contact list"), "TopicOnClist", 0, 1, nullptr },

 	{ LPGENW("Do not pop up the window when joining a chat room"), "PopupOnJoin", 0, 0, nullptr },

-	{ LPGENW("Hide or show the window by double click in the contact list"), "ToggleVisibility", 0, 0, nullptr },

 	{ LPGENW("Sync splitter position with standard IM sessions"), "SyncSplitter", 0, 0, nullptr },

 	{ LPGENW("Show contact's status modes if supported by the protocol"), "ShowContactStatus", 0, 1, nullptr },

 	{ LPGENW("Display contact's status icon before user role icon"), "ContactStatusFirst", 0, 0, nullptr },

diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp
index a45ca08495..c204f62095 100644
--- a/src/core/stdmsg/src/chat_options.cpp
+++ b/src/core/stdmsg/src/chat_options.cpp
@@ -43,7 +43,6 @@ static branch_t branch1[] = {
 	{ LPGENW("Show the topic of the room on your contact list (if supported)"), "TopicOnClist", 0, false },
 	{ LPGENW("Do not play sounds when the chat room is focused"), "SoundsFocus", 0, false },
 	{ LPGENW("Do not pop up the window when joining a chat room"), "PopupOnJoin", 0, false },
-	{ LPGENW("Toggle the visible state when double clicking in the contact list"), "ToggleVisibility", 0, false },
 	{ LPGENW("Show contact statuses if protocol supports them"), "ShowContactStatus", 0, false },
 	{ LPGENW("Display contact status icon before user role icon"), "ContactStatusFirst", 0, false },
 };
diff --git a/src/mir_app/src/chat_clist.cpp b/src/mir_app/src/chat_clist.cpp
index 82a7aa4843..b78094d782 100644
--- a/src/mir_app/src/chat_clist.cpp
+++ b/src/mir_app/src/chat_clist.cpp
@@ -114,8 +114,7 @@ int RoomDoubleclicked(WPARAM hContact, LPARAM)
 

 	SESSION_INFO *si = SM_FindSession(roomid, szProto);

 	if (si) {

-		// is the "toggle visibility option set, so we need to close the window?

-		if (si->pDlg != nullptr && db_get_b(0, CHAT_MODULE, "ToggleVisibility", 0) == 1 && !cli.pfnGetEvent(hContact, 0) && IsWindowVisible(si->pDlg->GetHwnd()) && !IsIconic(si->pDlg->GetHwnd())) {

+		if (si->pDlg != nullptr && !cli.pfnGetEvent(hContact, 0) && IsWindowVisible(si->pDlg->GetHwnd()) && !IsIconic(si->pDlg->GetHwnd())) {

 			si->pDlg->CloseTab();

 			return 1;

 		}