ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-06-09 11:52:27 +03:00
Code Issues Projects Releases Wiki Activity

EDMarketConnector: Care about "are we already running?" check

Browse Source 
1) Don't log in this check, we're a different process.
2) But we've stomped the plain log file already!
3) Python 3.8.6 seems to not like sys.exit(0) from that ctypes code, so
 `return False` instead and check the return from EnumWindows().
This commit is contained in:
Athanasius 2020-10-14 20:00:03 +01:00
parent 404f1fa641
commit 3a57128e28
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
EDMarketConnector.py
View File

@ -1357,8 +1357,8 @@ def enforce_single_instance() -> None: # noqa: CCR001
and GetProcessHandleFromHwnd(window_handle): and GetProcessHandleFromHwnd(window_handle):
# If GetProcessHandleFromHwnd succeeds then the app is already running as this user # If GetProcessHandleFromHwnd succeeds then the app is already running as this user
if len(sys.argv) > 1 and sys.argv[1].startswith(protocolhandler.redirect): if len(sys.argv) > 1 and sys.argv[1].startswith(protocolhandler.redirect):
logger.debug('Browser invoked us directly with auth response. ' # logger.debug('Browser invoked us directly with auth response. '
'Forwarding the response to the other app instance.') # 'Forwarding the response to the other app instance.')
CoInitializeEx(0, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE) CoInitializeEx(0, COINIT_APARTMENTTHREADED | COINIT_DISABLE_OLE1DDE)
# Wait for it to be responsive to avoid ShellExecute recursing # Wait for it to be responsive to avoid ShellExecute recursing
ShowWindow(window_handle, SW_RESTORE) ShowWindow(window_handle, SW_RESTORE)
@ -1368,12 +1368,13 @@ def enforce_single_instance() -> None: # noqa: CCR001
ShowWindowAsync(window_handle, SW_RESTORE) ShowWindowAsync(window_handle, SW_RESTORE)
SetForegroundWindow(window_handle) SetForegroundWindow(window_handle)
logger.info(f'A running {applongname} process was found, exiting.') # logger.info(f'A running {applongname} process was found, exiting.')
sys.exit(0) return False
return True return True
EnumWindows(enumwindowsproc, 0) if not EnumWindows(enumwindowsproc, 0):
sys.exit(0)
def test_logging() -> None: def test_logging() -> None: