From 19419000585934500b4dc87553e1153cfe7195ed Mon Sep 17 00:00:00 2001
From: Julian Smith <jules@op59.net>
Date: Sat, 6 Jun 2020 09:55:33 +0100
Subject: [PATCH] In multiplayer setttings window, added checkbox for
 multiplayer record.

Also mark the setting (/sim/replay/multiplayer) as userarchive so it is
preserved across fg sessions.
---
 defaults.xml                |  1 +
 gui/dialogs/multiplayer.xml | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/defaults.xml b/defaults.xml
index 7530c1f4f..a7a87308a 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -844,6 +844,7 @@ Started September 2000 by David Megginson, david@megginson.com
         <!-- 1 h -->
       </buffer>
       <tape-directory type="string" userarchive="y"/>
+      <multiplayer type="bool" userarchive="y"/>
     </replay>
     <airport>
       <runways>
diff --git a/gui/dialogs/multiplayer.xml b/gui/dialogs/multiplayer.xml
index 403bd4d8d..a19f5224d 100644
--- a/gui/dialogs/multiplayer.xml
+++ b/gui/dialogs/multiplayer.xml
@@ -172,6 +172,20 @@
             <col>1</col>
             <colspan>2</colspan>
             <halign>left</halign>
+            <name>multiplayer-record</name>
+            <label>Include multiplayer aircraft in recordings</label>
+            <property>/sim/replay/multiplayer</property>
+            <binding>
+                <command>dialog-apply</command>
+                <object-name>multiplayer-record</object-name>
+            </binding>
+        </checkbox>
+
+        <checkbox>
+            <row>3</row>
+            <col>1</col>
+            <colspan>2</colspan>
+            <halign>left</halign>
             <visible>
                 <property>sim/multiplay/transmit-filter-property-base-available</property>
             </visible>
@@ -185,7 +199,7 @@
         </checkbox>
 
         <combo>
-            <row>3</row>
+            <row>4</row>
             <col>1</col>
             <halign>left</halign>
             <name>protocol-version</name>
@@ -213,20 +227,20 @@
             </binding>
         </combo>
         <text>
-            <row>3</row>
+            <row>4</row>
             <col>0</col>
             <halign>right</halign>
             <label>Compatibility</label>
         </text>
 
         <text>
-            <row>4</row>
+            <row>5</row>
             <col>0</col>
             <halign>right</halign>
             <label>   Callsign:</label>
         </text>
         <input>
-            <row>4</row>
+            <row>5</row>
             <col>1</col>
             <halign>left</halign>
             <property>/sim/multiplay/callsign</property>
@@ -237,7 +251,7 @@
             </enable>
         </input>
         <text>
-          <row>6</row><col>0</col>
+          <row>7</row><col>0</col>
           <halign>right</halign>
           <label>Server:</label>
         </text>
@@ -254,7 +268,7 @@
         </combo>
         <group>
             <layout>hbox</layout>
-            <row>4</row>
+            <row>5</row>
             <col>1</col>
             <text>
                 <width>2</width>