From 50ccb631636dac169c1e19b4e67db3407530709a Mon Sep 17 00:00:00 2001
From: Volker Fischer <corrados@users.noreply.github.com>
Date: Mon, 1 Jun 2020 09:55:31 +0200
Subject: [PATCH] merge fixes

---
 ChangeLog         | 3 +++
 src/server.cpp    | 8 +++++---
 src/serverdlg.cpp | 8 ++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc9f9338..2dcae62c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,11 @@
 
 
 
+
 3.5.6git
 
+- enable/disable recording from command line, coded by pljones (#228)
+
 - added check in acknowledge message, coded by atsampson (#302)
 
 - bug fix: on MacOS declare an activity to ensure the process doesn't get throttled
diff --git a/src/server.cpp b/src/server.cpp
index dbd423cf..4ee8533e 100755
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -400,11 +400,11 @@ CServer::CServer ( const int          iNewMaxNumChan,
             QString().number( static_cast<int> ( iPortNumber ) ) );
     }
 
-    // Enable jam recording (if requested) - kicks off the thread
+    // enable jam recording (if requested) - kicks off the thread
     if ( !strRecordingDirName.isEmpty() )
     {
         bRecorderInitialised = JamRecorder.Init ( this, iServerFrameSizeSamples );
-        bEnableRecording = bRecorderInitialised;
+        bEnableRecording     = bRecorderInitialised;
     }
 
     // enable all channels (for the server all channel must be enabled the
@@ -717,8 +717,10 @@ void CServer::RequestNewRecording()
 
 void CServer::SetEnableRecording ( bool bNewEnableRecording )
 {
-    if ( bRecorderInitialised ) {
+    if ( bRecorderInitialised )
+    {
         bEnableRecording = bNewEnableRecording;
+
         if ( !bEnableRecording )
         {
             emit StopRecorder();
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index a01739c9..4da2893a 100755
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -699,9 +699,9 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
     }
 
     Qt::CheckState csIsEnabled;
-    QString currentSessionDir = edtCurrentSessionDir->text();
-    bool    bIsRecording      = false;
-    QString strRecorderStatus;
+    QString        currentSessionDir = edtCurrentSessionDir->text();
+    bool           bIsRecording      = false;
+    QString        strRecorderStatus;
 
     if ( pServer->GetRecordingEnabled() )
     {
@@ -719,7 +719,7 @@ void CServerDlg::UpdateRecorderStatus ( QString sessionDir )
     }
     else
     {
-        csIsEnabled = Qt::CheckState::Unchecked;
+        csIsEnabled       = Qt::CheckState::Unchecked;
         strRecorderStatus = tr ( "Not enabled" );
     }