diff options
| -rw-r--r-- | include/m_options.h | 4 | ||||
| -rw-r--r-- | src/mir_app/src/options.cpp | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/m_options.h b/include/m_options.h index 99a8995b09..6bd7f96600 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -94,9 +94,9 @@ EXTERN_C MIR_APP_DLL(void) KillModuleOptions(HPLUGIN); // Opens the options dialog, optionally at the specified page
// Returns 0 on success, nonzero on failure
-EXTERN_C MIR_APP_DLL(int) Options_Open(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN);
+EXTERN_C MIR_APP_DLL(void) Options_Open(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN);
// Opens the options dialog, with only specified page
-EXTERN_C MIR_APP_DLL(HWND) Options_OpenPage(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN);
+EXTERN_C MIR_APP_DLL(void) Options_OpenPage(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, HPLUGIN);
#endif //M_OPTIONS_H__
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();
}
/////////////////////////////////////////////////////////////////////////////////////////
|