diff --git a/src/librssguard/miscellaneous/autosaver.cpp b/src/librssguard/miscellaneous/autosaver.cpp index c43d09d5e..9271d6f30 100644 --- a/src/librssguard/miscellaneous/autosaver.cpp +++ b/src/librssguard/miscellaneous/autosaver.cpp @@ -35,13 +35,16 @@ void AutoSaver::changeOccurred() { saveIfNeccessary(); } else { - m_timer.start(m_periodicSaveMsecs); + QMetaObject::invokeMethod(&m_timer, + "start", + Qt::ConnectionType::BlockingQueuedConnection, + Q_ARG(int, m_periodicSaveMsecs)); } } void AutoSaver::saveIfNeccessary() { if (m_timer.isActive()) { - m_timer.stop(); + QMetaObject::invokeMethod(&m_timer, "stop", Qt::ConnectionType::BlockingQueuedConnection); m_firstChange.invalidate(); if (!QMetaObject::invokeMethod(parent(), qPrintable(m_savingSlot), Qt::ConnectionType::DirectConnection)) { diff --git a/src/librssguard/network-web/cookiejar.h b/src/librssguard/network-web/cookiejar.h index 69975262b..f3e1468f4 100644 --- a/src/librssguard/network-web/cookiejar.h +++ b/src/librssguard/network-web/cookiejar.h @@ -14,6 +14,8 @@ class QWebEngineCookieStore; #endif class CookieJar : public QNetworkCookieJar { + Q_OBJECT + public: explicit CookieJar(QObject* parent = nullptr); @@ -29,15 +31,15 @@ class CookieJar : public QNetworkCookieJar { public: static QList extractCookiesFromUrl(const QString& url); + public slots: + void loadCookies(); + void saveCookies(); + private: bool insertCookieInternal(const QNetworkCookie& cookie, bool notify_others, bool should_save); bool updateCookieInternal(const QNetworkCookie& cookie, bool notify_others); bool deleteCookieInternal(const QNetworkCookie& cookie, bool notify_others); - private slots: - void loadCookies(); - void saveCookies(); - private: #if defined(USE_WEBENGINE) QWebEngineCookieStore* m_webEngineCookies;