fixes #3127 (tabSRMM: сделать настройки про добавление двоеточия и запятой взаимоисключающими)

3 files changed, 3 insertions, 1 deletions

diff --git a/src/core/stdmsg/src/chat_manager.cpp b/src/core/stdmsg/src/chat_manager.cpp
index 3add13cfd6..9fd934ded6 100644
--- a/src/core/stdmsg/src/chat_manager.cpp
+++ b/src/core/stdmsg/src/chat_manager.cpp
@@ -116,6 +116,7 @@ static void OnLoadSettings()
 	g_Settings.bTabsEnable = db_get_b(0, CHAT_MODULE, "Tabs", 1) != 0;
 	g_Settings.bTabsAtBottom = db_get_b(0, CHAT_MODULE, "TabBottom", 0) != 0;
 	g_Settings.bTabCloseOnDblClick = db_get_b(0, CHAT_MODULE, "TabCloseOnDblClick", 0) != 0;
+	g_Settings.bAddColonToAutoComplete = db_get_b(0, CHAT_MODULE, "AddColonToAutoComplete", 1) != 0;
 
 	g_Settings.iSplitterX = db_get_w(0, CHAT_MODULE, "SplitterX", 105);
 	if (g_Settings.iSplitterX <= 50)
diff --git a/src/core/stdmsg/src/stdafx.h b/src/core/stdmsg/src/stdafx.h
index 9d2e1ca151..00fe48a237 100644
--- a/src/core/stdmsg/src/stdafx.h
+++ b/src/core/stdmsg/src/stdafx.h
@@ -143,7 +143,9 @@ struct GlobalLogSettings : public GlobalLogSettingsBase
 {

 	int iX, iY;

 	int iSplitterX, iSplitterY;

+	

 	bool bTabsEnable, bTabsAtBottom, bTabCloseOnDblClick;

+	bool bAddColonToAutoComplete;

 };

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/src/mir_app/src/chat_opts.cpp b/src/mir_app/src/chat_opts.cpp
index 2fc6966d28..64a36af0bd 100644
--- a/src/mir_app/src/chat_opts.cpp
+++ b/src/mir_app/src/chat_opts.cpp
@@ -225,7 +225,6 @@ void LoadGlobalSettings(void)
 	g_Settings->bStripFormat = db_get_b(0, CHAT_MODULE, "StripFormatting", 0) != 0;

 	g_Settings->bTrayIconInactiveOnly = g_bChatTrayInactive;

 	g_Settings->bPopupInactiveOnly = g_bChatPopupInactive;

-	g_Settings->bAddColonToAutoComplete = db_get_b(0, CHAT_MODULE, "AddColonToAutoComplete", 1) != 0;

 	g_Settings->iPopupStyle = db_get_b(0, CHAT_MODULE, "PopupStyle", 1);

 	g_Settings->iPopupTimeout = db_get_w(0, CHAT_MODULE, "PopupTimeout", 3);

 	g_Settings->crPUBkgColour = db_get_dw(0, CHAT_MODULE, "PopupColorBG", GetSysColor(COLOR_WINDOW));