Merge remote-tracking branch 'origin/main' into v0.5.x

chalet-org · Sep 28, 2022 · b64a5e3 · b64a5e3
2 parents 9db5adf + 8aa74f1
commit b64a5e3
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/State/CentralState.cpp b/src/State/CentralState.cpp
@@ -59,8 +59,6 @@ bool CentralState::initialize()
 	// 	return false;
 
 	{
-		m_inputs.detectToolchainPreference();
-
 		// Set global defaults here
 		IntermediateSettingsState state;
 		state.maxJobs = std::thread::hardware_concurrency();
@@ -89,6 +87,9 @@ bool CentralState::initialize()
 			return false;
 	}
 
+	// If no toolchain was found in inputs or settings, use the default
+	m_inputs.detectToolchainPreference();
+
 	m_filename = m_inputs.inputFile();
 	m_inputs.clearWorkingDirectory(m_filename);