ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 08:17:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into feature/847/capi-fleetcarrier

Browse Source
This commit is contained in:
aussig 2022-12-24 10:38:22 +00:00
commit 1c39ca5eb9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
EDMarketConnector.py
View File

@ -1537,7 +1537,7 @@ class AppWindow(object):
and config.get_int('output') & config.OUT_SHIP:
monitor.export_ship()
if monitor.cmdr and monitor.system and monitor.station:
if monitor.cmdr:
err = plug.notify_journal_entry(
monitor.cmdr,
monitor.is_beta,
@ -1547,10 +1547,10 @@ class AppWindow(object):
monitor.state
)
if err:
self.status['text'] = err
if not config.get_int('hotkey_mute'):
hotkeymgr.play_bad()
if err:
self.status['text'] = err
if not config.get_int('hotkey_mute'):
hotkeymgr.play_bad()
auto_update = False
# Only if auth callback is not pending
@ -1638,10 +1638,10 @@ class AppWindow(object):
if monitor.cmdr:
err = plug.notify_dashboard_entry(monitor.cmdr, monitor.is_beta, entry)
if err:
self.status['text'] = err
if not config.get_int('hotkey_mute'):
hotkeymgr.play_bad()
if err:
self.status['text'] = err
if not config.get_int('hotkey_mute'):
hotkeymgr.play_bad()
def plugin_error(self, event=None) -> None:
"""Display asynchronous error from plugin."""

2
plug.py
View File

@ -286,7 +286,7 @@ def notify_prefs_changed(cmdr: str | None, is_beta: bool) -> None:
def notify_journal_entry(
cmdr: str, is_beta: bool, system: str, station: str,
cmdr: str, is_beta: bool, system: str | None, station: str | None,
entry: MutableMapping[str, Any],
state: Mapping[str, Any]
) -> Optional[str]: