ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix unhandled null causing crash when using osmesa with nvidia driver

This commit is contained in:
davg-qqq 2020-05-03 19:34:49 +02:00
parent d556c99771
commit a1791a24f0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
desmume/src/OGLRender_3_2.cpp
View File

@ -2033,8 +2033,11 @@ void OpenGLRenderer_3_2::GetExtensionSet(std::set<std::string> *oglExtensionSet)
glGetIntegerv(GL_NUM_EXTENSIONS, &extensionCount); glGetIntegerv(GL_NUM_EXTENSIONS, &extensionCount);
for (size_t i = 0; i < extensionCount; i++) for (size_t i = 0; i < extensionCount; i++)
{ {
std::string extensionName = std::string((const char *)glGetStringi(GL_EXTENSIONS, i)); const char * extensionName = (const char *)glGetStringi(GL_EXTENSIONS, i);
oglExtensionSet->insert(extensionName); if (extensionName == NULL) {
continue;
}
oglExtensionSet->insert(std::string(extensionName));
} }
} }