openal_track: Improve failure handling

Warzone2100 · Jul 5, 2024 · e6c7946 · e6c7946
1 parent 3f177bb
commit e6c7946
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/lib/sound/openal_track.cpp b/lib/sound/openal_track.cpp
@@ -185,6 +185,13 @@ bool sound_InitLibrary(HRTFMode hrtf)
 	if (!context)
 	{
 		debug(LOG_ERROR, "Couldn't open audio context.");
+
+		debug(LOG_SOUND, "close device");
+		if (alcCloseDevice(device) == ALC_FALSE)
+		{
+			debug(LOG_SOUND, "OpenAl could not close the audio device.");
+		}
+		device = nullptr;
 		return false;
 	}
 
@@ -194,6 +201,21 @@ bool sound_InitLibrary(HRTFMode hrtf)
 	if (err != ALC_NO_ERROR)
 	{
 		debug(LOG_ERROR, "Couldn't initialize audio context: %s", alcGetString(device, err));
+
+		alcGetError(device);	// clear error codes
+
+		alcMakeContextCurrent(nullptr);
+		sound_GetContextError(device);
+		alcDestroyContext(context); // this gives a long delay on some impl.
+		context = nullptr;
+		sound_GetContextError(device);
+
+		debug(LOG_SOUND, "close device");
+		if (alcCloseDevice(device) == ALC_FALSE)
+		{
+			debug(LOG_SOUND, "OpenAl could not close the audio device.");
+		}
+		device = nullptr;
 		return false;
 	}
 
@@ -364,6 +386,7 @@ void sound_ShutdownLibrary(void)
 
 	debug(LOG_SOUND, "destroy previous context");
 	alcDestroyContext(context); // this gives a long delay on some impl.
+	context = nullptr;
 	sound_GetContextError(device);
 
 	debug(LOG_SOUND, "close device");