From cc6e2206916ab7d31ee454367eccd64f585f4552 Mon Sep 17 00:00:00 2001
From: CommanderMark <commanderpro100@gmail.com>
Date: Sat, 10 Jun 2017 23:24:24 -0400
Subject: [PATCH] Moved the execution of the save coroutine to
 JobNamePreferences' setter.

Juanjp pointed out that it would run the coroutine if you modified changes in the settings without yet pressing "Apply".

Also reworded the job descriptions.
---
 Barotrauma/Content/Jobs.xml                 | 10 +++++-----
 Barotrauma/Source/GameSettings.cs           | 15 ++++++++-------
 Barotrauma/Source/Screens/NetLobbyScreen.cs |  2 +-
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/Barotrauma/Content/Jobs.xml b/Barotrauma/Content/Jobs.xml
index 86b9ab96c..0b98e6c24 100644
--- a/Barotrauma/Content/Jobs.xml
+++ b/Barotrauma/Content/Jobs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Jobs>
-  <Job name="Captain" description="The Commanding Officer with authority over the entire crew. The captain is responsible for commanding the rest of the crew and trying to keep everything running smoothly." minnumber="1" maxnumber="1">
+  <Job name="Captain" description="The Commanding Officer is responsible for commanding the entirety of the crew and ensuring that everything is running smoothly." minnumber="1" maxnumber="1">
     <Skills>
       <Skill name="Weapons" level="50,60"/>
       <Skill name="Construction" level="20,30"/>
@@ -18,7 +18,7 @@
     </Items>
   </Job>
   
-  <Job name="Engineer" description="Engineers have above-average construction and mechanic skills, but fixing complex mechanical devices is still usually out of their skill set. They are competent at fixing electrical devices however, and are the ones to turn to when the power grid starts failing." minnumber="1">
+  <Job name="Engineer" description="Engineers are the backbone of a submarine's crew, complementing a mechanic's construction skill with their knowledge of electrical engineering. They are capable of performing maintenance on the various electrical pieces of the submarine." minnumber="1">
     <Skills>
       <Skill name="Weapons" level="10,30"/>
       <Skill name="Construction" level="20,30"/>
@@ -36,7 +36,7 @@
     </Items>
   </Job>
 
-  <Job name="Mechanic" description="Mechanics have high construction and mechanic skills. They are skilled at using tools such as plasma cutters and welders, and are usually the only ones who can fix broken mechanical devices." minnumber="1">
+  <Job name="Mechanic" description="Mechanics are capable of fixing various mechanical devices with their high construction skill. Together with engineers they ensure a submarine is working to its fullest." minnumber="1">
     <Skills>
       <Skill name="Weapons" level="10,30"/>
       <Skill name="Construction" level="50,60"/>
@@ -54,7 +54,7 @@
     </Items>
   </Job>
 
-  <Job name="Security Officer" description="Security officers are responsible for keeping the submarine safe from potential attackers. The creatures inhabiting the ocean aren't the only threat they need to worry about, as several of the renegade groups opposing the Europa Coalition are known to have sent infiltrators on board the vessels." maxnumber="2">
+  <Job name="Security Officer" description="Security Officers are responsible for keeping the submarine safe from threats, both external and internal. The creatures inhabiting the ocean aren't the only threat they need to worry about, as several of the renegade groups opposing the Europa Coalition are known to have sent infiltrators on board the vessels." maxnumber="2">
     <Skills>
       <Skill name="Weapons" level="50,60"/>
       <Skill name="Medical" level="30,40"/>
@@ -74,7 +74,7 @@
     </Items>
   </Job>
 
-  <Job name="Medical Doctor" description="The primary duty of the doctors is too help injured crew members, but their knowledge of chemistry and pharmaceutics can also be useful for creating various non-medicinal chemicals." maxnumber="2">
+  <Job name="Medical Doctor" description="Although usually taken for granted, Doctors play an important role on the submarine, possessing the required skill to treat injured or unconscious crew members. Their skills can also be useful for creating various non-medicinal chemicals." maxnumber="2">
     <Skills>
       <Skill name="Weapons" level="10,20"/>
       <Skill name="Construction" level="10,20"/>
diff --git a/Barotrauma/Source/GameSettings.cs b/Barotrauma/Source/GameSettings.cs
index 7f969eb44..c032645d5 100644
--- a/Barotrauma/Source/GameSettings.cs
+++ b/Barotrauma/Source/GameSettings.cs
@@ -61,7 +61,14 @@ namespace Barotrauma
         public List<string> JobNamePreferences
         {
             get { return jobNamePreferences; }
-            set { UnsavedSettings = true; jobNamePreferences = value; }
+            set
+            {
+                // Begin saving coroutine. Remove any existing save coroutines if one is running.
+                if (CoroutineManager.IsCoroutineRunning("saveCoroutine")) { CoroutineManager.StopCoroutines("saveCoroutine"); }
+                CoroutineManager.StartCoroutine(ApplyUnsavedChanges(), "saveCoroutine");
+
+                jobNamePreferences = value;
+            }
         }
 
         public string   MasterServerUrl { get; set; }
@@ -81,12 +88,6 @@ namespace Barotrauma
             private set
             {
                 unsavedSettings = value;
-                // Beging saving coroutine. Remove any existing save coroutines if one is running.
-                if (CoroutineManager.IsCoroutineRunning("saveCoroutine")) { CoroutineManager.StopCoroutines("saveCoroutine"); }
-                if (unsavedSettings == true)
-                {
-                    CoroutineManager.StartCoroutine(ApplyUnsavedChanges(), "saveCoroutine");
-                }
 
                 if (applyButton != null)
                 {
diff --git a/Barotrauma/Source/Screens/NetLobbyScreen.cs b/Barotrauma/Source/Screens/NetLobbyScreen.cs
index fb77c397a..8d1ea20ff 100644
--- a/Barotrauma/Source/Screens/NetLobbyScreen.cs
+++ b/Barotrauma/Source/Screens/NetLobbyScreen.cs
@@ -546,7 +546,7 @@ namespace Barotrauma
                     if (job == null) { continue; }
 
                     GUITextBlock jobText = new GUITextBlock(new Rectangle(0, 0, 0, 20),  i + ". " + job.Name + "    ", 
-                        "",Alignment.Left, Alignment.Right, jobList, false,
+                        "", Alignment.Left, Alignment.Right, jobList, false,
                         GameMain.GraphicsWidth<1000 ? GUI.SmallFont : GUI.Font);
                     jobText.UserData = job;