From 6fd11a21f5c589aab856ca5992fea768820229ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20M=C3=BCller?= <nexyon@gmail.com>
Date: Sun, 10 Mar 2019 23:28:51 +0100
Subject: Fix T62255: Blender defaults to "OpenAL Soft" in sound settings,
 regardless of saved preferences

- Default device (index 0) was hard coded.
- Also fixing crash with invalid device passed to blender via -setaudio.
---
 extern/audaspace/src/devices/DeviceManager.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'extern/audaspace')

diff --git a/extern/audaspace/src/devices/DeviceManager.cpp b/extern/audaspace/src/devices/DeviceManager.cpp
index 2ebc3d58c86..304f8b49f70 100644
--- a/extern/audaspace/src/devices/DeviceManager.cpp
+++ b/extern/audaspace/src/devices/DeviceManager.cpp
@@ -35,7 +35,12 @@ void DeviceManager::registerDevice(std::string name, std::shared_ptr<IDeviceFact
 
 std::shared_ptr<IDeviceFactory> DeviceManager::getDeviceFactory(std::string name)
 {
-	return m_factories[name];
+	auto it = m_factories.find(name);
+
+	if(it == m_factories.end())
+		return nullptr;
+
+	return it->second;
 }
 
 std::shared_ptr<IDeviceFactory> DeviceManager::getDefaultDeviceFactory()
-- 
cgit v1.2.3