small merge changes

This commit is contained in:
Volker Fischer 2020-05-16 09:24:46 +02:00
parent e529baeb94
commit ab31fc476f

View File

@ -668,13 +668,10 @@ void CServer::OnAboutToQuit()
void CServer::OnHandledSignal ( int sigNum )
{
#ifdef _WIN32
// Windows does not actually get OnHandledSignal triggered
QCoreApplication::instance()->exit();
Q_UNUSED ( sigNum )
#else
switch ( sigNum )
{
@ -690,12 +687,18 @@ void CServer::OnHandledSignal ( int sigNum )
default:
break;
}
#endif
}
void CServer::RequestNewRecording()
{
if ( bEnableRecording )
{
emit RestartRecorder();
}
}
void CServer::Start()
{
// only start if not already running
@ -1590,11 +1593,3 @@ void CServer::CreateLevelsForAllConChannels ( const int i
vecLevelsOut[j] = static_cast<uint16_t> ( ceil ( dCurSigLevel ) );
}
}
void CServer::RequestNewRecording()
{
if ( bEnableRecording )
{
emit RestartRecorder();
}
}