From 8a99219456f58b4f0e3345dc8f03aef206b4e9cb Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sun, 15 Jun 2025 18:25:42 +0000 Subject: [PATCH] follow-up prev: electrum-ecc should search for libsecp dll in electrum/ The hack needs to be applied before we try importing electrum_ecc, i.e. it needs to be in the main script. However, it should also be applied if the main script is not invoked directly, but e.g. the user imports electrum directly. Hence the duplication. --- electrum/__init__.py | 2 +- run_electrum | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/electrum/__init__.py b/electrum/__init__.py index a704a87c5..793f2930c 100644 --- a/electrum/__init__.py +++ b/electrum/__init__.py @@ -6,7 +6,7 @@ is_bundle = getattr(sys, 'frozen', False) is_local = not is_bundle and os.path.exists(os.path.join(os.path.dirname(os.path.dirname(__file__)), "electrum.desktop")) # when running from source, on Windows, also search for DLLs in inner 'electrum' folder -if is_local and os.name == 'nt': +if is_local and os.name == 'nt': # fixme: duplicated between main script and __init__.py :( os.add_dll_directory(os.path.dirname(__file__)) diff --git a/run_electrum b/run_electrum index 957b862b9..31fbc8369 100755 --- a/run_electrum +++ b/run_electrum @@ -65,6 +65,11 @@ if is_pyinstaller: _file = open(sys.executable, 'rb') +# when running from source, on Windows, also search for DLLs in inner 'electrum' folder +if is_local and os.name == 'nt': # fixme: duplicated between main script and __init__.py :( + os.add_dll_directory(os.path.join(os.path.dirname(__file__), 'electrum')) + + def check_imports(): # pure-python dependencies need to be imported here for pyinstaller try: