Merge branch 'master' into develop

JetStream96 · Apr 15, 2018 · 48bc08d · 48bc08d
2 parents c34ebcf + 84eedda
commit 48bc08d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/QSP/ChangeLog.txt b/src/QSP/ChangeLog.txt
@@ -1,4 +1,7 @@
-version 0.4.3
+version 0.4.4
+* Fix errors when calculating fuel with certain aircrafts.
+
+version 0.4.3
 * Add profiles for A320 family.
 * Fix fuel burn bias bug.
 

diff --git a/src/QSP/FuelCalculation/FuelData/IFuelTableExtension.cs b/src/QSP/FuelCalculation/FuelData/IFuelTableExtension.cs
@@ -2,9 +2,12 @@
 {
     public static class IFuelTableExtension
     {
+        /// <summary>
+        /// Returns null if f is null.
+        /// </summary>
         public static IFuelTable WithBias(this IFuelTable f, double bias)
         {
-            return new Helper(f, bias);
+            return f == null ? null : new Helper(f, bias);
         }
 
         private class Helper : IFuelTable

diff --git a/src/QSP/Properties/AssemblyInfo.cs b/src/QSP/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.4.3.0")]
+[assembly: AssemblyVersion("0.4.4.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]