Fixed #193 run ignoring --ls-max

eyeonus · Mar 2, 2015 · 7a7c269 · 7a7c269
1 parent 20c4bc4
commit 7a7c269
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -4,6 +4,7 @@ TradeDangerous, Copyright (C) Oliver "kfsone" Smith, July 2014
 
 v6.12.4 Mar 02 2015
 . (kfsone) Added 175 Systems 
+. (kfsone) Fixed #193 "run" was ignoring --ls-max
 
 v6.12.3 Mar 01 2015
 . (kfsone) Improved how we handle some edge cases with --from and --to,

diff --git a/commands/run_cmd.py b/commands/run_cmd.py
@@ -912,7 +912,7 @@ def run(results, cmdenv, tdb):
     avoidPlaces = cmdenv.avoidPlaces
     stopStations = cmdenv.destinations
     goalSystem = cmdenv.goalSystem
-    maxLs = cmdenv.maxLsFromStar
+    maxLs = cmdenv.maxLs
 
     startCr = cmdenv.credits - cmdenv.insurance
 

diff --git a/tradecalc.py b/tradecalc.py
@@ -723,7 +723,7 @@ def getBestHops(self, routes, restrictTo=None):
         maxJumpsPer = tdenv.maxJumpsPer
         maxLyPer = tdenv.maxLyPer
         maxPadSize = tdenv.padSize
-        maxLsFromStar = tdenv.maxLsFromStar or float('inf')
+        maxLsFromStar = tdenv.maxLs or float('inf')
         reqBlackMarket = getattr(tdenv, 'blackMarket', False) or False
         maxAge = getattr(tdenv, 'maxAge') or 0
         credits = tdenv.credits - (getattr(tdenv, 'insurance', 0) or 0)