From e6ce4f4bca8ea41e5a75d252d8ccf8d7d2e17841 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 13 Sep 2022 04:51:29 -0700
Subject: =?UTF-8?q?fixes=20#3193=20(=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5,=20=D0=BF=D0=BE=D1=8F=D1=81=D0=BD=D1=8F=D1=8E=D1=89?=
 =?UTF-8?q?=D0=B5=D0=B5,=20=D1=87=D1=82=D0=BE=20=D0=B4=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=83=D0=BF=20=D0=BA=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B9=D0=BA=D0=B0=D0=BC=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87?=
 =?UTF-8?q?=D1=91=D0=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mir_app/src/options.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index d63e02ee10..ea7f32ac99 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -198,8 +198,8 @@ struct OptionsPageData : public MZeroedObject
 			CMPluginBase *p = (CMPluginBase*)src.pPlugin;
 			pDialog = new COptionPageDialog(*p, (INT_PTR)src.pszTemplate, src.pfnDlgProc, src.dwInitParam);
 		}
-		else
-			pDialog = src.pDialog;
+		else pDialog = src.pDialog;
+
 		assert(pDialog != nullptr);
 
 		flags = src.flags;
@@ -1170,8 +1170,12 @@ void OpenAccountOptions(PROTOACCOUNT *pa)
 static void OpenOptionsNow(HPLUGIN pPlugin, const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, bool bSinglePage)
 {
 	// Hidden setting
-	if (!db_get_b(0, "Options", "Enable", true))
+	if (!db_get_b(0, "Options", "Enable", true)) {
+		MessageBoxW(0,
+			TranslateT("Options dialog is disabled by the system administrator. Contact him if you need to edit options"),
+			L"Miranda NG", MB_ICONEXCLAMATION);
 		return;
+	}
 
 	if (pOptionsDlg == nullptr) {
 		OptionsPageList arPages(1);
-- 
cgit v1.2.3