From 3671ab7b3552624701b65dd19efaf143d5e214c2 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Thu, 14 Sep 2017 08:45:58 +0200 Subject: [PATCH] SAMPLE build for testing. --- src/miscellaneous/application.cpp | 53 +++++++++++++++++-------------- 1 file changed, 30 insertions(+), 23 deletions(-) diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp index d1ae4421f..2363ab1a9 100755 --- a/src/miscellaneous/application.cpp +++ b/src/miscellaneous/application.cpp @@ -357,51 +357,58 @@ void Application::onSaveState(QSessionManager& manager) { } void Application::onAboutToQuit() { - eliminateFirstRun(); + /* + + eliminateFirstRun(); eliminateFirstRun(APP_VERSION); -#if defined(USE_WEBENGINE) + + #if defined(USE_WEBENGINE) AdBlockManager::instance()->save(); -#endif + #endif + // Make sure that we obtain close lock BEFORE even trying to quit the application. const bool locked_safely = feedUpdateLock()->tryLock(4 * CLOSE_LOCK_TIMEOUT); processEvents(); qDebug("Cleaning up resources and saving application state."); -#if defined(Q_OS_WIN) + + #if defined(Q_OS_WIN) system()->removeTrolltechJunkRegistryKeys(); -#endif + #endif + qApp->feedReader()->quit(); database()->saveDatabase(); if (mainForm() != nullptr) { - mainForm()->saveSize(); + mainForm()->saveSize(); } if (locked_safely) { - // Application obtained permission to close in a safe way. - qDebug("Close lock was obtained safely."); - // We locked the lock to exit peacefully, unlock it to avoid warnings. - feedUpdateLock()->unlock(); + // Application obtained permission to close in a safe way. + qDebug("Close lock was obtained safely."); + // We locked the lock to exit peacefully, unlock it to avoid warnings. + feedUpdateLock()->unlock(); } else { - // Request for write lock timed-out. This means - // that some critical action can be processed right now. - qDebug("Close lock timed-out."); + // Request for write lock timed-out. This means + // that some critical action can be processed right now. + qDebug("Close lock timed-out."); } // Now, we can check if application should just quit or restart itself. if (m_shouldRestart) { - finish(); - qDebug("Killing local peer connection to allow another instance to start."); + finish(); + qDebug("Killing local peer connection to allow another instance to start."); - // TODO: Start RSS Guard with sleep before it cross-platform way if possible. - // sleep 5 && "". - if (QProcess::startDetached(QString("\"") + QDir::toNativeSeparators(applicationFilePath()) + QString("\""))) { - qDebug("New application instance was started."); - } - else { - qWarning("New application instance was not started successfully."); - } + // TODO: Start RSS Guard with sleep before it cross-platform way if possible. + // sleep 5 && "". + if (QProcess::startDetached(QString("\"") + QDir::toNativeSeparators(applicationFilePath()) + QString("\""))) { + qDebug("New application instance was started."); + } + else { + qWarning("New application instance was not started successfully."); + } } + */ } void Application::restart() {