small merge changes
This commit is contained in:
parent
e529baeb94
commit
ab31fc476f
1 changed files with 8 additions and 13 deletions
|
@ -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,10 +687,16 @@ void CServer::OnHandledSignal ( int sigNum )
|
|||
|
||||
default:
|
||||
break;
|
||||
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
#endif
|
||||
void CServer::RequestNewRecording()
|
||||
{
|
||||
if ( bEnableRecording )
|
||||
{
|
||||
emit RestartRecorder();
|
||||
}
|
||||
}
|
||||
|
||||
void CServer::Start()
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue