TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 23:24:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Correctly handle invalid openvr adapters

Browse source
This commit is contained in:
James Urquhart 2016-05-01 00:09:50 +01:00
parent b2faecc82d
commit b58f34da9b
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/gfx/gfxInit.cpp
View file

@ -296,15 +296,19 @@ GFXAdapter *GFXInit::getBestAdapterChoice()
const String adapterDevice = Con::getVariable("$Video::forceDisplayAdapter"); const String adapterDevice = Con::getVariable("$Video::forceDisplayAdapter");
GFXAdapterType adapterType = getAdapterTypeFromName(renderer.c_str());; GFXAdapterType adapterType = getAdapterTypeFromName(renderer.c_str());;
GFXAdapter *adapter; GFXAdapter *adapter = NULL;
if (adapterDevice.isEmpty()) if (adapterDevice.isEmpty())
{ {
adapter = chooseAdapter(adapterType, outputDevice.c_str()); adapter = chooseAdapter(adapterType, outputDevice.c_str());
} }
else if (dAtoi(adapterDevice.c_str()) != -1) else
{ {
adapter = chooseAdapter(adapterType, dAtoi(adapterDevice.c_str())); S32 adapterIdx = dAtoi(adapterDevice.c_str());
if (adapterIdx == -1)
adapter = chooseAdapter(adapterType, outputDevice.c_str());
else
adapter = chooseAdapter(adapterType, adapterIdx);
} }
// Did they have one? Return it. // Did they have one? Return it.