diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 5b0599196..64a1c20af 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -30,7 +30,7 @@ https://martinrotter.github.io/donate/ - + none diff --git a/resources/scripts/7za b/resources/scripts/7za index 9c10723bf..47f412575 160000 --- a/resources/scripts/7za +++ b/resources/scripts/7za @@ -1 +1 @@ -Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 +Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9 diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index 3211b63ee..e8b35fe6f 100755 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -39,6 +39,7 @@ Application::Application(const QString& id, int& argc, char** argv) : QtSingleApplication(id, argc, argv), m_updateFeedsLock(new Mutex()) { parseCmdArguments(); + qInstallMessageHandler(performLogging); m_feedReader = nullptr; m_quitLogicDone = false; @@ -54,8 +55,6 @@ Application::Application(const QString& id, int& argc, char** argv) m_downloadManager = nullptr; m_shouldRestart = false; - // Setup debug output system. - qInstallMessageHandler(performLogging); determineFirstRuns(); //: Abbreviation of language, e.g. en. @@ -91,7 +90,13 @@ QString s_customLogFile = QString(); void Application::performLogging(QtMsgType type, const QMessageLogContext& context, const QString& msg) { #ifndef QT_NO_DEBUG_OUTPUT QString console_message = qFormatLogMessage(type, context, msg); - std::cout << console_message.toStdString() << std::endl; + + if (type == QtMsgType::QtCriticalMsg || type == QtMsgType::QtFatalMsg || type == QtMsgType::QtWarningMsg) { + std::cerr << console_message.toStdString() << std::endl; + } + else { + std::cout << console_message.toStdString() << std::endl; + } if (!s_customLogFile.isEmpty()) { QFile log_file(s_customLogFile);