From 30d43c30b7711f1b168a004755534b2b3d659bdc Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Fri, 10 Jan 2025 22:41:07 -0500
Subject: [PATCH] Prefer using pythonw on Windows
---
scripting/python_manager.cpp | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/scripting/python_manager.cpp b/scripting/python_manager.cpp
index 37f4f79df0..70526e87a3 100644
--- a/scripting/python_manager.cpp
+++ b/scripting/python_manager.cpp
@@ -29,6 +29,7 @@
#include <paths.h>
#include <pgm_base.h>
#include <python_manager.h>
+#include <thread_pool.h>
#include <wx_filename.h>
@@ -134,7 +135,10 @@ void PYTHON_MANAGER::Execute( const wxString& aArgs,
// If we need to use the async monitor thread approach and preserve the stdout
// contents in the future, a more complicated hack might be necessary.
if( !aSaveOutput )
- auto future = std::async( std::launch::async, monitor, process );
+ {
+ thread_pool& tp = GetKiCadThreadPool();
+ auto ret = tp.submit( monitor, process );
+ }
}
}
@@ -143,7 +147,7 @@ wxString PYTHON_MANAGER::FindPythonInterpreter()
{
// First, attempt to use a Python we distribute with KiCad
#if defined( __WINDOWS__ )
- wxFileName pythonExe = FindKicadFile( "python.exe" );
+ wxFileName pythonExe = FindKicadFile( "pythonw.exe" );
if( pythonExe.IsFileExecutable() )
return pythonExe.GetFullPath();
@@ -174,7 +178,7 @@ wxString PYTHON_MANAGER::FindPythonInterpreter()
#ifdef _WIN32
wxArrayString output;
- if( 0 == wxExecute( wxS( "where python.exe" ), output, wxEXEC_SYNC ) )
+ if( 0 == wxExecute( wxS( "where pythonw.exe" ), output, wxEXEC_SYNC ) )
{
if( !output.IsEmpty() )
return output[0];