merge fixes

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

src/server.cpp

@@ -400,7 +400,7 @@ 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 );
@@ -717,8 +717,10 @@ void CServer::RequestNewRecording()
 
 void CServer::SetEnableRecording ( bool bNewEnableRecording )
 {
-    if ( bRecorderInitialised ) {
+    if ( bRecorderInitialised )
+    {
         bEnableRecording = bNewEnableRecording;
+
         if ( !bEnableRecording )
         {
             emit StopRecorder();