frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on startup X server is not available (#895)

Browse Source
This commit is contained in:
Murat Seker
2020-07-23 16:50:37 +02:00
committed by GitHub
parent 6f5f28cd56
commit e52fd7b557
7 changed files with 113 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libsrc/utils/Logger.cpp
View File

@@ -128,12 +128,13 @@ Logger::Logger (const QString & name, LogLevel minLevel)
{
qRegisterMetaType<Logger::T_LOG_MESSAGE>();
int count = LoggerCount.fetchAndAddOrdered(1);
if (_syslogEnabled && count == 1)
if (LoggerCount.fetchAndAddOrdered(1) == 1)
{
#ifndef _WIN32
openlog (_appname.toLocal8Bit(), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL0);
if (_syslogEnabled)
{
openlog (_appname.toLocal8Bit(), LOG_CONS | LOG_PID | LOG_NDELAY, LOG_LOCAL0);
}
#endif
}
}
@@ -142,11 +143,16 @@ Logger::~Logger()
{
//Debug(this, "logger '%s' destroyed", QSTRING_CSTR(_name) );
int count = LoggerCount.fetchAndSubOrdered(1);
if (LoggerCount.fetchAndSubOrdered(1) == 0)
{
#ifndef _WIN32
if (_syslogEnabled && count == 0)
closelog();
if (_syslogEnabled)
{
closelog();
}
#endif
}
}
void Logger::write(const Logger::T_LOG_MESSAGE & message) const