eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge fixes

Browse source
This commit is contained in:
Volker Fischer 2020-06-13 08:20:03 +02:00
parent 83c34d061c
commit e1b982c34c
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/server.cpp
View file

@ -666,7 +666,10 @@ void CServer::OnAboutToQuit()
void CServer::OnHandledSignal ( int sigNum ) 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 #ifdef _WIN32
// Windows does not actually get OnHandledSignal triggered // Windows does not actually get OnHandledSignal triggered
QCoreApplication::instance()->exit(); QCoreApplication::instance()->exit();
@ -710,9 +713,12 @@ void CServer::SetEnableRecording ( bool bNewEnableRecording )
// note that this block executes regardless of whether // note that this block executes regardless of whether
// what appears to be a change is being applied, to ensure // what appears to be a change is being applied, to ensure
// the requested state is the result // the requested state is the result
bEnableRecording = bNewEnableRecording; bEnableRecording = bNewEnableRecording;
#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0)
// TODO we should use the ConsoleWriterFactory() instead of qInfo()
qInfo() << "Recording state " << ( bEnableRecording ? "enabled" : "disabled" ); qInfo() << "Recording state " << ( bEnableRecording ? "enabled" : "disabled" );
#endif
if ( !bEnableRecording ) if ( !bEnableRecording )
{ {