From c528bf86cd2b2f45fc81e43a44b7438e7747b3d9 Mon Sep 17 00:00:00 2001 From: RadRussianRus Date: Tue, 8 Mar 2022 14:15:41 +0300 Subject: [PATCH] Version 1.4.9: try using bare ReadOption instead of ReadBoolOption --- Telegram/SourceFiles/data/data_chat_filters.cpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Telegram/SourceFiles/data/data_chat_filters.cpp b/Telegram/SourceFiles/data/data_chat_filters.cpp index b6a088e12..efc0e13e6 100644 --- a/Telegram/SourceFiles/data/data_chat_filters.cpp +++ b/Telegram/SourceFiles/data/data_chat_filters.cpp @@ -80,17 +80,6 @@ bool ReadIntOption(QJsonObject obj, QString key, std::function callba return (readValueResult && readResult); } -bool ReadBoolOption(QJsonObject obj, QString key, std::function callback) { - auto readResult = false; - auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) { - if (v.isBool()) { - callback(v.toBool()); - readResult = true; - } - }); - return (readValueResult && readResult); -} - bool ReadArrayOption(QJsonObject obj, QString key, std::function callback) { auto readResult = false; auto readValueResult = ReadOption(obj, key, [&](QJsonValue v) { @@ -175,8 +164,8 @@ LocalFolder MakeLocalFolder(const QJsonObject &obj) { }); for (const auto &[flag, option] : LocalFolderSettingsFlags) { - ReadBoolOption(obj, option, [&](auto v) { - if (v) { + ReadOption(obj, option, [&](auto v) { + if (v.isBool() && v.toBool()) { result.flags |= flag; } });