Fix variant crash

LAGonauta · Dec 2, 2023 · 145b3b3 · 145b3b3
1 parent dd262cf
commit 145b3b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/AudioEngine.cpp b/src/AudioEngine.cpp
@@ -728,9 +728,12 @@ namespace MetaAudio
 		settings.version = STEAMAUDIO_VERSION;
 		settings.logCallback = reinterpret_cast<IPLLogFunction>(SteamAudioLog);
 		auto result = SteamAudio::Context::Create(settings);
-		if (std::get<1>(result) != IPL_STATUS_SUCCESS) {
-			SteamAudioLog(IPLLogLevel::IPL_LOGLEVEL_ERROR, "Unable to load SteamAudio");
-			return;
+		if (std::holds_alternative<IPLerror>(result)) {
+			auto& err = std::get<1>(result);
+			if (err != IPL_STATUS_SUCCESS) {
+				SteamAudioLog(IPLLogLevel::IPL_LOGLEVEL_ERROR, "Unable to load SteamAudio");
+				return;
+			}
 		}
 		sa_context = std::get<0>(result);
 		IPLSimulationSettings simulationSettings{};

diff --git a/src/Effects/SteamAudioOcclusionCalculator.cpp b/src/Effects/SteamAudioOcclusionCalculator.cpp
@@ -35,7 +35,7 @@ namespace MetaAudio
 		IPLSourceSettings sourceSettings{};
 		sourceSettings.flags = IPLSimulationFlags::IPL_SIMULATIONFLAGS_DIRECT;
 		auto sourceResult = simulator.SourceCreate(sourceSettings);
-		if (std::get<1>(sourceResult) != IPLerror::IPL_STATUS_SUCCESS) {
+		if (std::holds_alternative<IPLerror>(sourceResult) && std::get<1>(sourceResult) != IPLerror::IPL_STATUS_SUCCESS) {
 			// TODO: LOG
 			return OcclusionFrequencyGain{ 1.0f, 1.0f, 1.0f };
 		}

diff --git a/src/Loaders/SteamAudioMapMeshLoader.cpp b/src/Loaders/SteamAudioMapMeshLoader.cpp
@@ -153,7 +153,7 @@ namespace MetaAudio
         IPLSceneSettings settings{};
         settings.type = IPLSceneType::IPL_SCENETYPE_DEFAULT;
         auto sceneResult = this->sa_context.CreateScene(settings);
-        if (std::get<1>(sceneResult) != IPLerror::IPL_STATUS_SUCCESS) {
+		if (std::holds_alternative<IPLerror>(sceneResult) && std::get<1>(sceneResult) != IPLerror::IPL_STATUS_SUCCESS) {
             // TODO: log error and return instead of throw?
             throw std::runtime_error("Error creating scene: " + std::to_string(std::get<1>(sceneResult)));
             //return;
@@ -170,15 +170,15 @@ namespace MetaAudio
         staticMeshSettings.materialIndices = materialIndices.data();
 
         auto staticMeshResult = scene.StaticMeshCreate(staticMeshSettings);
-        if (std::get<1>(staticMeshResult) != IPLerror::IPL_STATUS_SUCCESS) {
+		if (std::holds_alternative<IPLerror>(staticMeshResult) && std::get<1>(staticMeshResult) != IPLerror::IPL_STATUS_SUCCESS) {
             throw std::runtime_error("Error creating static mesh: " + std::to_string(std::get<1>(staticMeshResult)));
         }
         auto& staticMesh = std::get<0>(staticMeshResult);
         scene.StaticMeshAdd(staticMesh);
         scene.Commit();
 
         auto simulatorResult = sa_context.CreateSimulator(sa_simul_settings);
-        if (std::get<1>(simulatorResult) != IPLerror::IPL_STATUS_SUCCESS) {
+		if (std::holds_alternative<IPLerror>(simulatorResult) && std::get<1>(simulatorResult) != IPLerror::IPL_STATUS_SUCCESS) {
             throw std::runtime_error("Error creating simulator: " + std::to_string(std::get<1>(simulatorResult)));
         }
         auto& simulator = std::get<0>(simulatorResult);