From 1c18edac762b91a7f8308174ef236eaf45c90f52 Mon Sep 17 00:00:00 2001 From: "Vladimir Golovnev (Glassez)" Date: Fri, 19 Jan 2018 09:43:43 +0300 Subject: [PATCH] Remove legacy and corrupted RSS settings --- src/base/rss/rss_session.cpp | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/src/base/rss/rss_session.cpp b/src/base/rss/rss_session.cpp index a3cac71f1..d2565571e 100644 --- a/src/base/rss/rss_session.cpp +++ b/src/base/rss/rss_session.cpp @@ -102,6 +102,27 @@ Session::Session() m_refreshTimer.start(m_refreshInterval * MsecsPerMin); refresh(); } + + // Remove legacy/corrupted settings + // (at least on Windows, QSettings is case-insensitive and it can get + // confused when asked about settings that differ only in their case) + auto settingsStorage = SettingsStorage::instance(); + settingsStorage->removeValue("Rss/streamList"); + settingsStorage->removeValue("Rss/streamAlias"); + settingsStorage->removeValue("Rss/open_folders"); + settingsStorage->removeValue("Rss/qt5/splitter_h"); + settingsStorage->removeValue("Rss/qt5/splitterMain"); + settingsStorage->removeValue("Rss/hosts_cookies"); + settingsStorage->removeValue("RSS/streamList"); + settingsStorage->removeValue("RSS/streamAlias"); + settingsStorage->removeValue("RSS/open_folders"); + settingsStorage->removeValue("RSS/qt5/splitter_h"); + settingsStorage->removeValue("RSS/qt5/splitterMain"); + settingsStorage->removeValue("RSS/hosts_cookies"); + settingsStorage->removeValue("Rss/Session/EnableProcessing"); + settingsStorage->removeValue("Rss/Session/RefreshInterval"); + settingsStorage->removeValue("Rss/Session/MaxArticlesPerFeed"); + settingsStorage->removeValue("Rss/AutoDownloader/EnableProcessing"); } Session::~Session() @@ -295,20 +316,6 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder) void Session::loadLegacy() { - struct LegacySettingsDeleter - { - ~LegacySettingsDeleter() - { - auto settingsStorage = SettingsStorage::instance(); - settingsStorage->removeValue("Rss/streamList"); - settingsStorage->removeValue("Rss/streamAlias"); - settingsStorage->removeValue("Rss/open_folders"); - settingsStorage->removeValue("Rss/qt5/splitter_h"); - settingsStorage->removeValue("Rss/qt5/splitterMain"); - settingsStorage->removeValue("Rss/hosts_cookies"); - } - } legacySettingsDeleter; - const QStringList legacyFeedPaths = SettingsStorage::instance()->loadValue("Rss/streamList").toStringList(); const QStringList feedAliases = SettingsStorage::instance()->loadValue("Rss/streamAlias").toStringList(); if (legacyFeedPaths.size() != feedAliases.size()) {