pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed #359

Browse source
This commit is contained in:
Martin Rotter 2021-02-09 07:43:20 +01:00
parent 297c020d70
commit 7fa4586848
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="3.8.4" date="2021-02-08"/> <release version="3.8.4" date="2021-02-09"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

2
resources/scripts/7za

@ -1 +1 @@
Subproject commit 9c10723bfbaf6cb85107d6ee16e0324e9e487749 Subproject commit 47f4125753452eff8800dbd6600c5a05540b15d9

11
src/librssguard/miscellaneous/application.cpp
View file

@ -39,6 +39,7 @@
Application::Application(const QString& id, int& argc, char** argv) Application::Application(const QString& id, int& argc, char** argv)
: QtSingleApplication(id, argc, argv), m_updateFeedsLock(new Mutex()) { : QtSingleApplication(id, argc, argv), m_updateFeedsLock(new Mutex()) {
parseCmdArguments(); parseCmdArguments();
qInstallMessageHandler(performLogging);
m_feedReader = nullptr; m_feedReader = nullptr;
m_quitLogicDone = false; m_quitLogicDone = false;
@ -54,8 +55,6 @@ Application::Application(const QString& id, int& argc, char** argv)
m_downloadManager = nullptr; m_downloadManager = nullptr;
m_shouldRestart = false; m_shouldRestart = false;
// Setup debug output system.
qInstallMessageHandler(performLogging);
determineFirstRuns(); determineFirstRuns();
//: Abbreviation of language, e.g. en. //: 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) { void Application::performLogging(QtMsgType type, const QMessageLogContext& context, const QString& msg) {
#ifndef QT_NO_DEBUG_OUTPUT #ifndef QT_NO_DEBUG_OUTPUT
QString console_message = qFormatLogMessage(type, context, msg); 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()) { if (!s_customLogFile.isEmpty()) {
QFile log_file(s_customLogFile); QFile log_file(s_customLogFile);