* Fix RegulatedNoise crash on Elite Dangerous startup

* Fix version history
stringandstickytape · Jan 11, 2015 · 47d6ea4 · 47d6ea4
1 parent 4b59278
commit 47d6ea4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/RegulatedNoise/Enums and Utility Classes/RegulatedNoiseSettings.cs b/RegulatedNoise/Enums and Utility Classes/RegulatedNoiseSettings.cs
@@ -13,7 +13,7 @@ namespace RegulatedNoise
     [Serializable]
     public class RegulatedNoiseSettings
     {
-        public readonly decimal Version = 1.7m;
+        public readonly decimal Version = 1.71m;
 
         public string ProductsPath = "";
         public string GamePath = ""; //Should Replace ProductsPath by always contain the newest FORC-FDEV dir.

diff --git a/RegulatedNoise/Form1.cs b/RegulatedNoise/Form1.cs
@@ -923,7 +923,6 @@ private double DistanceInLightYears(string remoteSystemName, Point3D currentSyst
 
         private double DistanceInLightYears(string remoteSystemName, string homeSystemName)
         {
-            double dist;
             if (!SystemLocations.ContainsKey(homeSystemName))
                 return double.MaxValue;
 

diff --git a/RegulatedNoise/Form1.resx b/RegulatedNoise/Form1.resx
@@ -1499,7 +1499,18 @@
 </value>
   </data>
   <data name="textBox1.Text" xml:space="preserve">
-    <value>* Don't crash when calculating distances to systems that we don't know the location of
+    <value>v1.71
+* Fix RegulatedNoise crash on Elite Dangerous startup
+* Fix version history
+
+v1.7
+* station-to-station overhauled: now shows all round trips in a big list, can work in credits-per-light-year, shows outbound and return at the same time
+* Merge MRmP's changes to product directory detection
+* Move elite.json and station.csv to a Data subfolder
+* Check at startup for a new version, and notify the user if one is found
+* Fix GitHub issue #3: update station-to-station when updating rest of GUI
+* Don't crash when calculating distances to systems that we don't know the location of
+* fix rename-loses-source-of-data bug
 
 v1.6
 * Add new OCR Corrections form ("Edit" button on Corrections tab)

diff --git a/RegulatedNoise/GameSettings.cs b/RegulatedNoise/GameSettings.cs
@@ -93,7 +93,7 @@ void LoadAppConfig()
         {
             var configFile = Path.Combine(Form1.RegulatedNoiseSettings.GamePath, "AppConfig.xml");
             var serializer = new XmlSerializer(typeof (AppConfig));
-            using (var myFileStream = new FileStream(configFile, FileMode.Open))
+            using (var myFileStream = new FileStream(configFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
                 AppConfig = (AppConfig) serializer.Deserialize(myFileStream);    
             }
@@ -108,7 +108,7 @@ void LoadDisplaySettings()
         {
             var configFile = Path.Combine(Form1.RegulatedNoiseSettings.ProductAppData, "Graphics" ,"DisplaySettings.xml");
             var serializer = new XmlSerializer(typeof(EdDisplayConfig));
-            using (var myFileStream = new FileStream(configFile, FileMode.Open))
+            using (var myFileStream = new FileStream(configFile, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
             {
                 Display = (EdDisplayConfig)serializer.Deserialize(myFileStream);
             }