From 1de59e72087dc982ea8421060402ebec70cea823 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 20 Jan 2019 17:46:15 +0100 Subject: Fix all profiles being created off-the-record --- lib/configuration/configuration.h | 3 --- lib/webprofile/webprofile.cpp | 8 -------- lib/webprofile/webprofilemanager.cpp | 5 +---- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/configuration/configuration.h b/lib/configuration/configuration.h index b05728a..40da50e 100644 --- a/lib/configuration/configuration.h +++ b/lib/configuration/configuration.h @@ -38,9 +38,6 @@ public: // in debug builds, check if setting exists if(vm.count(path) == 0) { -#ifdef QT_DEBUG - qWarning("value(%s) does not exist", path); -#endif return std::nullopt; } diff --git a/lib/webprofile/webprofile.cpp b/lib/webprofile/webprofile.cpp index ae6993e..b7747a7 100644 --- a/lib/webprofile/webprofile.cpp +++ b/lib/webprofile/webprofile.cpp @@ -19,10 +19,6 @@ WebProfile::WebProfile(const QString &name, QObject *parent) { m_name = name; -#ifdef QT_DEBUG - qDebug("Creating otr profile %s", qUtf8Printable(m_name)); -#endif - connect(this->cookieStore(), &QWebEngineCookieStore::cookieAdded, this, [this](const QNetworkCookie &cookie) { m_cookies.append(cookie); }); @@ -36,10 +32,6 @@ WebProfile::WebProfile(const QString &storageName, const QString &name, QObject { m_name = name; -#ifdef QT_DEBUG - qDebug("Creating profile %s", qUtf8Printable(m_name)); -#endif - connect(this->cookieStore(), &QWebEngineCookieStore::cookieAdded, this, [this](const QNetworkCookie &cookie) { m_cookies.append(cookie); }); diff --git a/lib/webprofile/webprofilemanager.cpp b/lib/webprofile/webprofilemanager.cpp index 2fca224..b0eff93 100644 --- a/lib/webprofile/webprofilemanager.cpp +++ b/lib/webprofile/webprofilemanager.cpp @@ -31,9 +31,6 @@ WebProfileManager::~WebProfileManager() delete p.settings; QFile::remove(filename); } else if(p.settings != nullptr) { -#ifdef QT_DEBUG - qDebug("sync %s", qUtf8Printable(p.settings->fileName())); -#endif p.settings->sync(); delete p.settings; } @@ -53,7 +50,7 @@ WebProfile *WebProfileManager::profile(const QString &id, const QString &path, b // QWebEngineCore cleans up profiles automatically, so no need to set parent profile.ptr = [id, isOffTheRecord, profile]() { - if(isOffTheRecord) + if(profile.value("otr", isOffTheRecord).toBool()) return new WebProfile(/* name */ profile.value("name", id).toString(), /* parent */ nullptr); else return new WebProfile(/* storageName */ id, /* name */ profile.value("name", id).toString(), /* parent */ nullptr); -- cgit v1.2.1