ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-07 02:43:22 +03:00
Code Issues Projects Releases Wiki Activity

EDMarketConnector: More misc type fixes

Browse Source
This commit is contained in:
Athanasius 2022-12-22 17:06:24 +00:00
parent e45a89d970
commit 69d764c027
No known key found for this signature in database
GPG Key ID: 772697E181BB2767
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
EDMarketConnector.py
View File

@ -1425,7 +1425,7 @@ class AppWindow(object):
config.set('cmdrs', config.get_list('cmdrs', default=[]) + [monitor.cmdr]) config.set('cmdrs', config.get_list('cmdrs', default=[]) + [monitor.cmdr])
self.login() self.login()
if monitor.mode == 'CQC' and entry['event']: if monitor.cmdr and monitor.mode == 'CQC' and entry['event']:
err = plug.notify_journal_entry_cqc(monitor.cmdr, monitor.is_beta, entry, monitor.state) err = plug.notify_journal_entry_cqc(monitor.cmdr, monitor.is_beta, entry, monitor.state)
if err: if err:
self.status['text'] = err self.status['text'] = err
@ -1443,7 +1443,9 @@ class AppWindow(object):
# Disable WinSparkle automatic update checks, IFF configured to do so when in-game # Disable WinSparkle automatic update checks, IFF configured to do so when in-game
if config.get_int('disable_autoappupdatecheckingame') and 1: if config.get_int('disable_autoappupdatecheckingame') and 1:
self.updater.set_automatic_updates_check(False) if self.updater is not None:
self.updater.set_automatic_updates_check(False)
logger.info('Monitor: Disable WinSparkle automatic update checks') logger.info('Monitor: Disable WinSparkle automatic update checks')
# Can't start dashboard monitoring # Can't start dashboard monitoring
@ -1455,12 +1457,16 @@ class AppWindow(object):
and config.get_int('output') & config.OUT_SHIP: and config.get_int('output') & config.OUT_SHIP:
monitor.export_ship() monitor.export_ship()
err = plug.notify_journal_entry(monitor.cmdr, if monitor.cmdr and monitor.system and monitor.station:
monitor.is_beta, err = plug.notify_journal_entry(
monitor.system, monitor.cmdr,
monitor.station, monitor.is_beta,
entry, monitor.system,
monitor.state) monitor.station,
entry,
monitor.state
)
if err: if err:
self.status['text'] = err self.status['text'] = err
if not config.get_int('hotkey_mute'): if not config.get_int('hotkey_mute'):
@ -1496,7 +1502,9 @@ class AppWindow(object):
if entry['event'] == 'ShutDown': if entry['event'] == 'ShutDown':
# Enable WinSparkle automatic update checks # Enable WinSparkle automatic update checks
# NB: Do this blindly, in case option got changed whilst in-game # NB: Do this blindly, in case option got changed whilst in-game
self.updater.set_automatic_updates_check(True) if self.updater is not None:
self.updater.set_automatic_updates_check(True)
logger.info('Monitor: Enable WinSparkle automatic update checks') logger.info('Monitor: Enable WinSparkle automatic update checks')
def auth(self, event=None) -> None: def auth(self, event=None) -> None:
@ -1539,7 +1547,9 @@ class AppWindow(object):
entry = dashboard.status entry = dashboard.status
# Currently we don't do anything with these events # Currently we don't do anything with these events
err = plug.notify_dashboard_entry(monitor.cmdr, monitor.is_beta, entry) if monitor.cmdr:
err = plug.notify_dashboard_entry(monitor.cmdr, monitor.is_beta, entry)
if err: if err:
self.status['text'] = err self.status['text'] = err
if not config.get_int('hotkey_mute'): if not config.get_int('hotkey_mute'):