summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/TabSRMM/src/hotkeyhandler.cpp4
-rw-r--r--plugins/TabSRMM/src/msgdialog.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index f0e79c78f8..fdaaa532b8 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -267,12 +267,12 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
do {
GetMenuItemInfoA(PluginConfig.g_hMenuTrayUnread, i, TRUE, &mii);
if (mii.dwItemData > 0) {
- UINT uid = GetMenuItemID(PluginConfig.g_hMenuTrayUnread, i);
+ uid = GetMenuItemID(PluginConfig.g_hMenuTrayUnread, i);
HandleMenuEntryFromhContact((MCONTACT)uid);
break;
}
}
- while (--i >= 0);
+ while (--i >= 0);
if (uid == 0 && pLastActiveContainer != NULL) { // no session found, restore last active container
if (IsIconic(pLastActiveContainer->hwnd) || !IsWindowVisible(pLastActiveContainer->hwnd)) {
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 9ab3fa73ff..ed9860f02f 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -3204,14 +3204,15 @@ quote_from_last:
int iOldItems = TabCtrl_GetItemCount(hwndTab);
if (!_tcsncmp(m_pContainer->szName, szNewName, CONTAINER_NAMELEN))
break;
-
+
TContainerData *pNewContainer = FindContainerByName(szNewName);
if (pNewContainer == NULL)
if ((pNewContainer = CreateContainer(szNewName, FALSE, dat->hContact)) == NULL)
break;
+
db_set_ts(dat->hContact, SRMSGMOD_T, "containerW", szNewName);
dat->fIsReattach = TRUE;
- PostMessage(PluginConfig.g_hwndHotkeyHandler, DM_DOCREATETAB, (WPARAM)pNewContainer, (LPARAM)dat->hContact);
+ PostMessage(PluginConfig.g_hwndHotkeyHandler, DM_DOCREATETAB, (WPARAM)pNewContainer, dat->hContact);
if (iOldItems > 1) // there were more than 1 tab, container is still valid
SendMessage(m_pContainer->hwndActive, WM_SIZE, 0, 0);
SetForegroundWindow(pNewContainer->hwnd);