Fix #13, python3Path setting

diff --git a/scripts/pico_project.py b/scripts/pico_project.py
index c784395ff28fdf521b808d20b1f0451b38fd60af..34289619d1ba8b17dfceeb5f2330d396559b1a25 100644 (file)
--- a/scripts/pico_project.py
+++ b/scripts/pico_project.py
@@ -1291,7 +1291,7 @@ def generateProjectFiles(projectPath, projectName, sdkPath, projects, debugger,
 
             if customPython:
                 settings += f''',
-    "raspberry-pi-pico.python3Path": "{sys.executable.replace(user_home, "${HOME}") if use_home_var else sys.executable}"'''
+    "raspberry-pi-pico.python3Path": "{sys.executable.replace("\\", "/").replace(user_home, "${HOME}") if use_home_var else sys.executable}"'''
                 
             settings += '\n}\n'
 

diff --git a/src/utils/download.mts b/src/utils/download.mts
index 11c7a3d190a24ed6f4ff1f433b37325f74fd1663..280ed530f08bc59b61b0f7241b46246eaec36910 100644 (file)
--- a/src/utils/download.mts
+++ b/src/utils/download.mts
@@ -183,7 +183,8 @@ async function unxzFile(
 export async function downloadAndInstallSDK(
   version: string,
   repositoryUrl: string,
-  settings: Settings
+  settings: Settings,
+  python3Path?: string
 ): Promise<boolean> {
   let gitExecutable: string | undefined =
     settings
@@ -238,8 +239,10 @@ export async function downloadAndInstallSDK(
       gitExecutable
     ))
   ) {
+    settings.reload();
     // check python requirements
     const python3Exe: string =
+      python3Path ||
       settings
         .getString(SettingsKey.python3Path)
         ?.replace(HOME_VAR, homedir().replaceAll("\\", "/")) ||

diff --git a/src/webview/newProjectPanel.mts b/src/webview/newProjectPanel.mts
index b6bda29e798987a4067e7e68c43ca9f428666b10..ef0622ae238ef00e5c3b31d39f1875740b5d5484 100644 (file)
--- a/src/webview/newProjectPanel.mts
+++ b/src/webview/newProjectPanel.mts
@@ -519,7 +519,9 @@ export class NewProjectPanel {
             !(await downloadAndInstallSDK(
               selectedSDK,
               SDK_REPOSITORY_URL,
-              this._settings
+              this._settings,
+              // python3Path is only possible undefined if downloaded and there is already checked and returned if this happened
+              python3Path!.replace(HOME_VAR, homedir().replaceAll("\\", "/"))
             )) ||
             !(await downloadAndInstallToolchain(selectedToolchain))
           ) {