fix: std override always enabling

This commit is contained in:
FalsePattern 2024-07-26 16:44:00 +02:00
parent f363e7d715
commit 1ed73226b2
Signed by: falsepattern
GPG key ID: E930CDEC50C50E23
3 changed files with 7 additions and 2 deletions

View file

@ -17,6 +17,11 @@ Changelog structure reference:
## [Unreleased] ## [Unreleased]
### Fixed
- Zig
- Standard library override always auto-enabling
## [16.1.0] ## [16.1.0]
### Added ### Added

View file

@ -89,7 +89,7 @@ public class ZigProjectSettingsPanel implements MyDisposable {
.map(PathUtil::pathFromString) .map(PathUtil::pathFromString)
.map(ZigToolchainProvider::findToolchain) .map(ZigToolchainProvider::findToolchain)
.orElse(null); .orElse(null);
return new ZigProjectSettings(StringUtil.blankToNull(pathToStdField.getText()), toolchain); return new ZigProjectSettings(stdFieldOverride.isSelected() ? StringUtil.blankToNull(pathToStdField.getText()) : null, toolchain);
} }
public void setData(ZigProjectSettings value) { public void setData(ZigProjectSettings value) {

View file

@ -36,7 +36,7 @@ public class ZigProjectSettings {
public String toolchainHomeDirectory; public String toolchainHomeDirectory;
public ZigProjectSettings(String explicitPathToStd, AbstractZigToolchain toolchain) { public ZigProjectSettings(String explicitPathToStd, AbstractZigToolchain toolchain) {
this(true, explicitPathToStd, (String)null); this(explicitPathToStd != null, explicitPathToStd, null);
setToolchain(toolchain); setToolchain(toolchain);
} }