From 6a04e67451c373751f0bdf7e1f3e697e9f7f08c3 Mon Sep 17 00:00:00 2001
From: Jonathan Harris <jonathan@marginal.org.uk>
Date: Tue, 2 May 2017 00:30:19 +0100
Subject: [PATCH] Check consistency of station between API and Journal

Fixes 204
---
 EDMarketConnector.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/EDMarketConnector.py b/EDMarketConnector.py
index 3a6213e3..0030f522 100755
--- a/EDMarketConnector.py
+++ b/EDMarketConnector.py
@@ -428,7 +428,11 @@ class AppWindow:
                 self.status['text'] = _("What are you flying?!")	# Shouldn't happen
             elif monitor.cmdr and data['commander']['name'] != monitor.cmdr:
                 raise companion.CmdrError()				# Companion API return doesn't match Journal
-            elif (auto_update and not data['commander'].get('docked')) or (monitor.system and data['lastSystem']['name'] != monitor.system) or (monitor.state['ShipID'] and data['ship']['id'] != monitor.state['ShipID']) or (monitor.state['ShipType'] and data['ship']['name'].lower() != monitor.state['ShipType']):
+            elif ((auto_update and not data['commander'].get('docked')) or
+                  (monitor.system and data['lastSystem']['name'] != monitor.system) or
+                  (monitor.station and data['lastStarport']['name'] != monitor.station) or
+                  (monitor.state['ShipID'] and data['ship']['id'] != monitor.state['ShipID']) or
+                  (monitor.state['ShipType'] and data['ship']['name'].lower() != monitor.state['ShipType'])):
                 raise companion.ServerLagging()
 
             else: