From 0d6b9512088d959126c965d82403623196a8ff85 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Fri, 8 Mar 2019 18:42:47 +0300
Subject: fixes #1890 (Send Screenshot plugin no longer functional after most
 recent update)

---
 plugins/MsgPopup/src/main.cpp  | 5 ++++-
 plugins/MsgPopup/src/version.h | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'plugins/MsgPopup/src')

diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp
index 810bb635bd..a9df9d1142 100644
--- a/plugins/MsgPopup/src/main.cpp
+++ b/plugins/MsgPopup/src/main.cpp
@@ -101,8 +101,11 @@ void popupMessage(LPCTSTR lpText, LPCTSTR lpCaption, UINT uType)
 		MessageBeep(uType);
 }
 
-int WINAPI newMessageBox(HWND, LPCTSTR lpText, LPCTSTR lpCaption, UINT uType)
+int WINAPI newMessageBox(HWND hWnd, LPCTSTR lpText, LPCTSTR lpCaption, UINT uType)
 {
+	if (!Popup_Enabled() || (uType & 0x0F))
+		return prevMessageBox(hWnd, lpText, lpCaption, uType);
+	
 	popupMessage(lpText, lpCaption, uType);
 	return IDOK;
 }
diff --git a/plugins/MsgPopup/src/version.h b/plugins/MsgPopup/src/version.h
index ecbccc9161..d0357be3f6 100644
--- a/plugins/MsgPopup/src/version.h
+++ b/plugins/MsgPopup/src/version.h
@@ -1,7 +1,7 @@
 #define __MAJOR_VERSION          0
 #define __MINOR_VERSION          1
 #define __RELEASE_NUM            2
-#define __BUILD_NUM              1
+#define __BUILD_NUM              2
 
 #include <stdver.h>
 
-- 
cgit v1.2.3