summaryrefslogtreecommitdiff
path: root/src/mir_app
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2020-07-09 17:30:23 +0300
committerGeorge Hazan <ghazan@miranda.im>2020-07-09 17:30:23 +0300
commitcb881b6406f878235405ecd94caa93f7f841dcfe (patch)
tree51cbc3263bbb01efb474cb5c647785254fada660 /src/mir_app
parent8a8d613373dc5a54dcf84025d53f5de4a8c4964f (diff)
fixes #2473 (Блокировка настроек от изменения)
остальное описано в задаче
Diffstat (limited to 'src/mir_app')
-rw-r--r--src/mir_app/src/options.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index 59e469be6d..f1f2e828b7 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -1172,6 +1172,10 @@ 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))
+ return;
+
if (pOptionsDlg == nullptr) {
OptionsPageList arPages(1);
NotifyEventHooks(hOptionsInitEvent, (WPARAM)&arPages, 0);
@@ -1184,16 +1188,14 @@ static void OpenOptionsNow(HPLUGIN pPlugin, const wchar_t *pszGroup, const wchar
else pOptionsDlg->Locate(pszGroup, pszPage, pPlugin);
}
-MIR_APP_DLL(int) Options_Open(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN pPlugin)
+MIR_APP_DLL(void) Options_Open(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN pPlugin)
{
OpenOptionsNow(pPlugin, pszGroup, pszPage, pszTab, false);
- return 0;
}
-MIR_APP_DLL(HWND) Options_OpenPage(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN pPlugin)
+MIR_APP_DLL(void) Options_OpenPage(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN pPlugin)
{
OpenOptionsNow(pPlugin, pszGroup, pszPage, pszTab, true);
- return pOptionsDlg->GetHwnd();
}
/////////////////////////////////////////////////////////////////////////////////////////