From 18a91339f2d9e1449887f5d993ab2f038ff56833 Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Thu, 5 Mar 2015 22:14:09 +0000
Subject: TabSRMM: code cleanup

git-svn-id: http://svn.miranda-ng.org/main/trunk@12344 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/msgdialog.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'plugins/TabSRMM/src/msgdialog.cpp')

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 6e992dacb1..39dd1d3f10 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -728,8 +728,6 @@ static LRESULT CALLBACK MessageEditSubclassProc(HWND hwnd, UINT msg, WPARAM wPar
 				return 0;
 			}
 		}
-		if (wParam == VK_RETURN)
-			break;
 
 	case WM_SYSKEYDOWN:
 		mwdat->fkeyProcessed = false;
@@ -2589,7 +2587,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 			menuID = MENU_PICMENU;
 
 		if ((menuID == MENU_PICMENU && ((dat->ace ? dat->ace->hbmPic : PluginConfig.g_hbmUnknown) || dat->hOwnPic) && dat->bShowAvatar != 0)) {
-			HMENU submenu = GetSubMenu(m_pContainer->hMenuContext, menuID == MENU_PICMENU ? 1 : 11);
+			HMENU submenu = GetSubMenu(m_pContainer->hMenuContext, 1);
 			GetCursorPos(&pt);
 			MsgWindowUpdateMenu(dat, submenu, menuID);
 			int iSelection = TrackPopupMenu(submenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL);
-- 
cgit v1.2.3