From f597087c1cb399f22ce288ba695bfef439705f2f Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 4 Sep 2023 20:26:55 +0300
Subject: =?UTF-8?q?fixes=20#3666=20(NewStory:=20=D0=B2=20=D1=87=D0=B0?=
 =?UTF-8?q?=D1=82=D0=B0=D1=85=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=82=D0=B0=D1=8E=D1=82=20=D0=BF=D1=83=D0=BD=D0=BA=D1=82=D1=8B?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B3=D0=BE=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B6=D1=83=D1=80?=
 =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D0=B0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/NewStory/src/history_menus.cpp | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'plugins')

diff --git a/plugins/NewStory/src/history_menus.cpp b/plugins/NewStory/src/history_menus.cpp
index fb2c2c356f..3226f73e05 100644
--- a/plugins/NewStory/src/history_menus.cpp
+++ b/plugins/NewStory/src/history_menus.cpp
@@ -33,7 +33,16 @@ HMENU NSMenu_Build(ItemData *item)
 
 bool NSMenu_Process(int iCommand, NewstoryListData *data)
 {
-	return Menu_ProcessCommandById(iCommand, LPARAM(data)) != 0;
+	if (Menu_ProcessCommandById(iCommand, LPARAM(data)))
+		return true;
+
+	if (auto *pDlg = data->pMsgDlg) {
+		PostMessage(pDlg->GetHwnd(), WM_MOUSEACTIVATE, 0, 0);
+		if (Chat_DoEventHook(pDlg->getChat(), GC_USER_LOGMENU, nullptr, nullptr, iCommand))
+			return true;
+	}
+
+	return false;
 }
 
 static INT_PTR NSMenuHelper(WPARAM wParam, LPARAM lParam)
@@ -72,12 +81,6 @@ static INT_PTR NSMenuHelper(WPARAM wParam, LPARAM lParam)
 	case MENU_BOOKMARK:
 		pData->ToggleBookmark();
 		break;
-
-	default:
-		if (auto *pDlg = pData->pMsgDlg) {
-			PostMessage(pDlg->GetHwnd(), WM_MOUSEACTIVATE, 0, 0);
-			Chat_DoEventHook(pDlg->getChat(), GC_USER_LOGMENU, nullptr, nullptr, wParam);
-		}
 	}
 	
 	return 0;
-- 
cgit v1.2.3