From da4f6222d806ff74f799a7e380eca20ab9ff3342 Mon Sep 17 00:00:00 2001 From: sudden6 Date: Sun, 16 Jul 2017 13:06:59 +0200 Subject: [PATCH] fix(settings): set default values for some important settings fix #4513 --- src/persistence/settings.cpp | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/persistence/settings.cpp b/src/persistence/settings.cpp index ef747f61d..01ad00d64 100644 --- a/src/persistence/settings.cpp +++ b/src/persistence/settings.cpp @@ -189,10 +189,9 @@ void Settings::loadGlobal() s.beginGroup("Advanced"); { - // TODO: Default values in this block should be changed @ v1.8 - makeToxPortable = s.value("makeToxPortable", makeToxPortable).toBool(); - enableIPv6 = s.value("enableIPv6", enableIPv6).toBool(); - forceTCP = s.value("forceTCP", forceTCP).toBool(); + makeToxPortable = s.value("makeToxPortable", false).toBool(); + enableIPv6 = s.value("enableIPv6", true).toBool(); + forceTCP = s.value("forceTCP", false).toBool(); } s.endGroup(); @@ -206,13 +205,12 @@ void Settings::loadGlobal() s.beginGroup("GUI"); { - // TODO: Default values in this block should be changed @ v1.8 - showWindow = s.value("showWindow", showWindow).toBool(); - showInFront = s.value("showInFront", showInFront).toBool(); - groupAlwaysNotify = s.value("groupAlwaysNotify", groupAlwaysNotify).toBool(); - groupchatPosition = s.value("groupchatPosition", groupchatPosition).toBool(); - separateWindow = s.value("separateWindow", separateWindow).toBool(); - dontGroupWindows = s.value("dontGroupWindows", dontGroupWindows).toBool(); + showWindow = s.value("showWindow", true).toBool(); + showInFront = s.value("showInFront", true).toBool(); + groupAlwaysNotify = s.value("groupAlwaysNotify", true).toBool(); + groupchatPosition = s.value("groupchatPosition", true).toBool(); + separateWindow = s.value("separateWindow", false).toBool(); + dontGroupWindows = s.value("dontGroupWindows", false).toBool(); const QString DEFAULT_SMILEYS = ":/smileys/emojione/emoticons.xml"; smileyPack = s.value("smileyPack", DEFAULT_SMILEYS).toString();