diff --git a/src/miscellaneous/feedreader.cpp b/src/miscellaneous/feedreader.cpp index fa86c2dd1..f365b1e86 100755 --- a/src/miscellaneous/feedreader.cpp +++ b/src/miscellaneous/feedreader.cpp @@ -271,8 +271,6 @@ void FeedReader::quit() { m_autoUpdateTimer->stop(); } - checkServicesForAsyncOperations(false, true); - // Close worker threads. if (m_feedDownloaderThread != nullptr && m_feedDownloaderThread->isRunning()) { m_feedDownloader->stopRunningUpdate(); diff --git a/src/services/abstract/cacheforserviceroot.cpp b/src/services/abstract/cacheforserviceroot.cpp index 7c7aa45ea..55c49cb47 100755 --- a/src/services/abstract/cacheforserviceroot.cpp +++ b/src/services/abstract/cacheforserviceroot.cpp @@ -125,8 +125,6 @@ void CacheForServiceRoot::loadCacheFromFile(int accId) { file.remove(); } - // TODO: TODO - m_cacheSaveMutex->unlock(); } diff --git a/src/services/abstract/serviceroot.cpp b/src/services/abstract/serviceroot.cpp index ceab15cc3..d4e76e9a7 100755 --- a/src/services/abstract/serviceroot.cpp +++ b/src/services/abstract/serviceroot.cpp @@ -40,6 +40,7 @@ bool ServiceRoot::deleteViaGui() { QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings); if (DatabaseQueries::deleteAccount(database, accountId())) { + stop(); requestItemRemoval(this); return true; } diff --git a/src/services/owncloud/owncloudserviceroot.cpp b/src/services/owncloud/owncloudserviceroot.cpp index 746e037a7..e7374767c 100755 --- a/src/services/owncloud/owncloudserviceroot.cpp +++ b/src/services/owncloud/owncloudserviceroot.cpp @@ -92,7 +92,7 @@ RecycleBin* OwnCloudServiceRoot::recycleBin() const { void OwnCloudServiceRoot::start(bool freshly_activated) { Q_UNUSED(freshly_activated) loadFromDatabase(); - //loadCacheFromFile(accountId()); + loadCacheFromFile(accountId()); if (qApp->isFirstRun(QSL("3.1.1")) || (childCount() == 1 && child(0)->kind() == RootItemKind::Bin)) { syncIn(); @@ -100,7 +100,7 @@ void OwnCloudServiceRoot::start(bool freshly_activated) { } void OwnCloudServiceRoot::stop() { - //saveCacheToFile(accountId()); + saveCacheToFile(accountId()); } QString OwnCloudServiceRoot::code() const { diff --git a/src/services/tt-rss/ttrssserviceroot.cpp b/src/services/tt-rss/ttrssserviceroot.cpp index 3d0640c6f..b33ef2240 100755 --- a/src/services/tt-rss/ttrssserviceroot.cpp +++ b/src/services/tt-rss/ttrssserviceroot.cpp @@ -51,6 +51,7 @@ TtRssServiceRoot::~TtRssServiceRoot() { void TtRssServiceRoot::start(bool freshly_activated) { Q_UNUSED(freshly_activated) loadFromDatabase(); + loadCacheFromFile(accountId()); if (qApp->isFirstRun(QSL("3.1.1")) || (childCount() == 1 && child(0)->kind() == RootItemKind::Bin)) { syncIn(); @@ -58,6 +59,8 @@ void TtRssServiceRoot::start(bool freshly_activated) { } void TtRssServiceRoot::stop() { + saveCacheToFile(accountId()); + m_network->logout(); qDebug("Stopping Tiny Tiny RSS account, logging out with result '%d'.", (int) m_network->lastError()); }