From e1b982c34c3c86999080755feac3b5eadd0c6f47 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Sat, 13 Jun 2020 08:20:03 +0200 Subject: [PATCH] merge fixes --- src/server.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server.cpp b/src/server.cpp index f968d979..1df29a55 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -666,7 +666,10 @@ void CServer::OnAboutToQuit() void CServer::OnHandledSignal ( int sigNum ) { -qDebug() << "OnHandledSignal" << sigNum; + // show the signal number on the command line (note that this does not work for the Windows command line) +// TODO we should use the ConsoleWriterFactory() instead of qDebug() + qDebug() << "OnHandledSignal: " << sigNum; + #ifdef _WIN32 // Windows does not actually get OnHandledSignal triggered QCoreApplication::instance()->exit(); @@ -710,9 +713,12 @@ void CServer::SetEnableRecording ( bool bNewEnableRecording ) // note that this block executes regardless of whether // what appears to be a change is being applied, to ensure // the requested state is the result - bEnableRecording = bNewEnableRecording; - qInfo() << "Recording state" << ( bEnableRecording ? "enabled" : "disabled" ); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) +// TODO we should use the ConsoleWriterFactory() instead of qInfo() + qInfo() << "Recording state " << ( bEnableRecording ? "enabled" : "disabled" ); +#endif if ( !bEnableRecording ) {