From 17d04723764358b2e54c5f52351e6bddbb773391 Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Mon, 28 Dec 2020 22:54:02 +0000
Subject: [PATCH] Updated flightrecorder properties and disabled recovery
 snapshot by default.

Has been causing confusion when fgtape dir is not writable.
---
 defaults.xml                    | 11 +++++-----
 gui/dialogs/flight-recorder.xml | 36 ++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/defaults.xml b/defaults.xml
index 1225e1b45..917490d40 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -784,17 +784,16 @@ Started September 2000 by David Megginson, david@megginson.com
         <!-- 1 h -->
       </buffer>
       <tape-directory type="string" userarchive="y"/>
-      <multiplayer type="bool" userarchive="y"/>
-      <record-properties type="bool" userarchive="y">true</record-properties>
-      <record-properties-paths>
-      </record-properties-paths>
-      <recovery-period type="int" userarchive="y">1</recovery-period>
-      
+      <recovery-period type="int" userarchive="y">0</recovery-period>
+      <record-multiplayer type="bool" userarchive="y"/>
       <record-main-window type="bool" userarchive="y">false</record-main-window>
       <record-main-view type="bool" userarchive="y">false</record-main-view>
       <replay-main-window-position type="bool" userarchive="y">false</replay-main-window-position>
       <replay-main-window-size type="bool" userarchive="y">false</replay-main-window-size>
       <replay-main-view type="bool" userarchive="y">false</replay-main-view>
+      <record-properties type="bool" userarchive="y">true</record-properties>
+      <record-properties-paths>
+      </record-properties-paths>
     </replay>
     <airport>
       <runways>
diff --git a/gui/dialogs/flight-recorder.xml b/gui/dialogs/flight-recorder.xml
index 019e397ec..5d00fb372 100644
--- a/gui/dialogs/flight-recorder.xml
+++ b/gui/dialogs/flight-recorder.xml
@@ -37,7 +37,7 @@
         <checkbox>
             <row>0</row>
             <col>0</col>
-            <property>sim/replay/multiplayer</property>
+            <property>sim/replay/record-continuous</property>
             <binding>
                 <command>dialog-apply</command>
             </binding>
@@ -45,27 +45,12 @@
         <text>
             <row>0</row>
             <col>1</col>
-            <label>Include multiplayer aircraft in recordings</label>
-            <halign>left</halign>
-        </text>
-    
-        <checkbox>
-            <row>1</row>
-            <col>0</col>
-            <property>sim/replay/record-continuous</property>
-            <binding>
-                <command>dialog-apply</command>
-            </binding>
-        </checkbox>
-        <text>
-            <row>1</row>
-            <col>1</col>
             <label>Continuous record to file</label>
             <halign>left</halign>
         </text>
     
         <checkbox>
-            <row>2</row>
+            <row>1</row>
             <col>0</col>
             <property>sim/replay/recovery-period</property>
             <binding>
@@ -73,12 +58,27 @@
             </binding>
         </checkbox>
         <text>
-            <row>2</row>
+            <row>1</row>
             <col>1</col>
             <label>Maintain recovery snapshot</label>
             <halign>left</halign>
         </text>
         
+        <checkbox>
+            <row>2</row>
+            <col>0</col>
+            <property>sim/replay/record-multiplayer</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>2</row>
+            <col>1</col>
+            <label>Include multiplayer aircraft in recordings</label>
+            <halign>left</halign>
+        </text>
+    
         <checkbox>
             <row>3</row>
             <col>0</col>