From e2b4965466dd2cedc2375bce97896232040b75c9 Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Tue, 26 May 2020 07:01:55 +0200
Subject: [PATCH] merge fixes

---
 src/serverdlg.cpp | 11 +++++------
 src/serverdlg.h   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 0f967d52..ca875306 100755
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -474,7 +474,7 @@ void CServerDlg::OnCentServAddrTypeActivated ( int iTypeIdx )
     UpdateGUIDependencies();
 }
 
-void CServerDlg::OnServerStopped();
+void CServerDlg::OnServerStopped()
 {
     UpdateSystemTrayIcon ( false );
     UpdateRecorderStatus ( QString::null );
@@ -533,7 +533,6 @@ void CServerDlg::OnTimer()
     ListViewMutex.unlock();
 }
 
-
 void CServerDlg::UpdateGUIDependencies()
 {
     // get the states which define the GUI dependencies from the server
@@ -591,7 +590,7 @@ void CServerDlg::UpdateGUIDependencies()
 
     lblRegSvrStatus->setText ( strStatus );
 
-    edtCurrentSessionDir->setText( "" );
+    edtCurrentSessionDir->setText ( "" );
     UpdateRecorderStatus ( QString::null );
 }
 
@@ -654,8 +653,8 @@ void CServerDlg::ModifyAutoStartEntry ( const bool bDoAutoStart )
 void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
 {
     QString currentSessionDir = edtCurrentSessionDir->text();
+    bool    bIsRecording      = false;
     QString strRecorderStatus;
-    bool bIsRecording = false;
 
     if ( pServer->GetRecordingEnabled() )
     {
@@ -663,7 +662,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
         {
             currentSessionDir = sessionDir != QString::null ? sessionDir : "";
             strRecorderStatus = tr ( "Recording" );
-            bIsRecording = true;
+            bIsRecording      = true;
         }
         else
         {
@@ -677,7 +676,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
 
     edtCurrentSessionDir->setVisible ( pServer->GetRecordingEnabled() );
     edtCurrentSessionDir->setEnabled ( bIsRecording );
-    edtCurrentSessionDir->setText( currentSessionDir );
+    edtCurrentSessionDir->setText    ( currentSessionDir );
 
     lblRecorderStatus->setText ( strRecorderStatus );
 
diff --git a/src/serverdlg.h b/src/serverdlg.h
index ef80c8e4..8227032a 100755
--- a/src/serverdlg.h
+++ b/src/serverdlg.h
@@ -103,7 +103,7 @@ public slots:
     void keyPressEvent ( QKeyEvent *e ) // block escape key
         { if ( e->key() != Qt::Key_Escape ) QDialog::keyPressEvent ( e ); }
 
-    void OnNewRecordingClicked(); { pServer->RestartRecorder(); }
+    void OnNewRecordingClicked() { pServer->RestartRecorder(); }
     void OnRecordingSessionStarted ( QString sessionDir )
         { UpdateRecorderStatus ( sessionDir ); }
 };