summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM/src/hotkeyhandler.cpp
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2017-07-10 19:44:03 +0300
committerGeorge Hazan <ghazan@miranda.im>2017-07-10 19:44:03 +0300
commita2e38963a647f9f58ff276d2ad9f89f7202c47eb (patch)
treeca043ab94971b442f02ec690d739031eee92f9c5 /plugins/TabSRMM/src/hotkeyhandler.cpp
parent18873004444063ae98a9e7fc9214bd3edaa146a7 (diff)
fixes #855 (TabSRMM - Move chat tab to another container switches chat into single conversation)
Diffstat (limited to 'plugins/TabSRMM/src/hotkeyhandler.cpp')
-rw-r--r--plugins/TabSRMM/src/hotkeyhandler.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 865f2a77af..af951250db 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -365,7 +365,11 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
else
SendMessage(hWnd, WM_CLOSE, 0, 1);
- CreateNewTabForContact((TContainerData*)wParam, lParam, true, true, false);
+ char *szProto = GetContactProto(lParam);
+ if (szProto != nullptr && db_get_b(lParam, szProto, "ChatRoom", 0))
+ ShowRoom((TContainerData*)wParam, SM_FindSessionByHCONTACT(lParam));
+ else
+ CreateNewTabForContact((TContainerData*)wParam, lParam, true, true, false);
}
}
}