From 66cd4225eb1a80411d9003c7277b8bff30dad657 Mon Sep 17 00:00:00 2001 From: Philipp Trulson Date: Thu, 13 Nov 2025 12:20:57 +0100 Subject: [PATCH 1/3] Fix System Profiler button on Linux --- prefs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prefs.py b/prefs.py index 762d9a27..bcdd04cf 100644 --- a/prefs.py +++ b/prefs.py @@ -63,7 +63,7 @@ def help_open_system_profiler(parent) -> None: profiler_path /= 'EDMCSystemProfiler.exe' subprocess.run(profiler_path, check=True) else: - subprocess.run(['python', "EDMCSystemProfiler.py"], shell=True, check=True) + subprocess.run(['python', "EDMCSystemProfiler.py"], shell=False, check=True) except Exception as err: parent.status["text"] = tr.tl("Error in System Profiler") # LANG: Catch & Record Profiler Errors logger.exception(err) From f80ac51fe2c278981bde1e9df642a56a7b537f20 Mon Sep 17 00:00:00 2001 From: Ben Peddell Date: Sat, 4 Oct 2025 01:50:31 +1000 Subject: [PATCH 2/3] [Bugfix] Fix race starting journal monitor Fixes a race identified where long plugin init times can result in the following error being thrown in the journal monitor thread, requiring a preferences reload to have journals continuing to be processed: ``` Exception in thread Journal worker: Traceback (most recent call last): File "/home/testing/.pyenv/versions/3.11.9/lib/python3.11/threading.py", line 1045, in _bootstrap_inner self.run() File "/home/testing/.pyenv/versions/3.11.9/lib/python3.11/threading.py", line 982, in run self._target(*self._args, **self._kwargs) File "/home/testing/gitstuff/EDMarketConnector/monitor.py", line 461, in worker self.root.event_generate('<>', when="tail") File "/home/testing/.pyenv/versions/3.11.9/lib/python3.11/tkinter/__init__.py", line 1933, in event_generate self.tk.call(args) RuntimeError: main thread is not in main loop ``` --- EDMarketConnector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EDMarketConnector.py b/EDMarketConnector.py index 92f34a48..421cc802 100755 --- a/EDMarketConnector.py +++ b/EDMarketConnector.py @@ -754,7 +754,7 @@ class AppWindow: config.delete('username', suppress=True) config.delete('password', suppress=True) config.delete('logdir', suppress=True) - self.postprefs(False) # Companion login happens in callback from monitor + self.w.after_idle(lambda: self.postprefs(False)) # Companion login happens in callback from monitor self.toggle_suit_row(visible=False) if args.start_min: logger.warning("Trying to start minimized") From 7a56ea78dcb0ef7c5430bff039ce031f5ac5af21 Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Mon, 17 Nov 2025 19:42:48 -0500 Subject: [PATCH 3/3] [5.13.3] Update Changelog --- ChangeLog.md | 19 +++++++++++++++++++ config/__init__.py | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog.md b/ChangeLog.md index b30b82b7..19972006 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -6,6 +6,25 @@ This is the master changelog for Elite Dangerous Market Connector. Entries are in the source (not distributed with the Windows installer) for the currently used version. --- +Release 5.13.3 +=== +This release contains a bugfix for a race condition that could occur if plugin setup took too long for the journal monitor thread. + +This often resulted in users seeing "Awaiting CMDR Login" even when already in the game. + +This will likely be the last release before 6.0.0. + +**Changes and Enhancements** +* Fixes a race condition in journal reading. + +**Plugin Developers** +* nb.Entry is deprecated, and is slated for removal in 6.0 or later. Please migrate to nb.EntryMenu +* nb.ColoredButton is deprecated, and is slated for removal in 6.0 or later. Please migrate to tk.Button +* Calling internal translations with `_()` is deprecated, and is slated for removal in 6.0 or later. Please migrate to importing `translations` and calling `translations.translate` or `translations.tl` directly +* `Translations` as the translate system singleton is deprecated, and is slated for removal in 6.0 or later. Please migrate to the `translations` singleton +* `help_open_log_folder()` is deprecated, and is slated for removal in 6.0 or later. Please migrate to open_folder() +* `update_feed` is deprecated, and is slated for removal in 6.0 or later. Please migrate to `get_update_feed()` + Release 5.13.2 === This release contains an update to a series of behind-the-scenes tools, as well as adding Corsair, Cobra Mk V, diff --git a/config/__init__.py b/config/__init__.py index 2c1d35fc..e1660b35 100644 --- a/config/__init__.py +++ b/config/__init__.py @@ -52,7 +52,7 @@ appcmdname = 'EDMC' # # Major.Minor.Patch(-prerelease)(+buildmetadata) # NB: Do *not* import this, use the functions appversion() and appversion_nobuild() -_static_appversion = '5.13.2' +_static_appversion = '5.13.3' _cached_version: semantic_version.Version | None = None copyright = '© 2015-2019 Jonathan Harris, 2020-2025 EDCD'