Skip to content

Commit 48bc08d

Browse files
committed
Merge branch 'master' into develop
2 parents c34ebcf + 84eedda commit 48bc08d

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

src/QSP/ChangeLog.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
version 0.4.3
1+
version 0.4.4
2+
* Fix errors when calculating fuel with certain aircrafts.
3+
4+
version 0.4.3
25
* Add profiles for A320 family.
36
* Fix fuel burn bias bug.
47

src/QSP/FuelCalculation/FuelData/IFuelTableExtension.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,12 @@
22
{
33
public static class IFuelTableExtension
44
{
5+
/// <summary>
6+
/// Returns null if f is null.
7+
/// </summary>
58
public static IFuelTable WithBias(this IFuelTable f, double bias)
69
{
7-
return new Helper(f, bias);
10+
return f == null ? null : new Helper(f, bias);
811
}
912

1013
private class Helper : IFuelTable

src/QSP/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("0.4.3.0")]
34+
[assembly: AssemblyVersion("0.4.4.0")]
3535
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)