Merge remote-tracking branch 'origin/main'

one-ware · Oct 16, 2024 · b9795b9 · b9795b9
2 parents 7a808d9 + ad71cd1
commit b9795b9
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCreatorViewModel.cs b/src/OneWare.UniversalFpgaProjectSystem/ViewModels/UniversalFpgaProjectCreatorViewModel.cs
@@ -106,17 +106,19 @@ public async Task SaveAsync(FlexibleWindow window)
                 ["Exclude"] = new JsonArray("build")
             };
             var root = new UniversalFpgaProjectRoot(projectFile, defaultProperties);
-
-            if (_fpgaService.Toolchains.FirstOrDefault(x => x.Name == _toolchainSetting.Value.ToString()) is { } tc)
-                root.Toolchain = tc;
-
+
             if (_fpgaService.Loaders.FirstOrDefault(x => x.Name == _loaderSetting.Value.ToString()) is { } loader)
                 root.Loader = loader;
-
+
+            if (_fpgaService.Toolchains.FirstOrDefault(x => x.Name == _toolchainSetting.Value.ToString()) is { } tc) {
+                root.Toolchain = tc;
+                tc.OnProjectCreated(root);    
+            }
+
             await _manager.SaveProjectAsync(root);
-
+            
             _projectExplorerService.Insert(root);
-
+            
             _projectExplorerService.ActiveProject = root;
 
             if (_fpgaService.Templates.FirstOrDefault(x => x.Name == _templateSetting.Value.ToString()) is { } template)