fixed: don't assing std::string to nullptr

popcornmix · Sep 20, 2015 · 6cb892e · 6cb892e
1 parent e319339
commit 6cb892e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/xbmc/windowing/X11/WinSystemX11GLContext.cpp b/xbmc/windowing/X11/WinSystemX11GLContext.cpp
@@ -165,10 +165,12 @@ bool CWinSystemX11GLContext::RefreshGLContext(bool force)
   if (ret && !firstrun)
     return ret;
 
-  std::string gpuvendor = "";
+  std::string gpuvendor;
   if (ret)
   {
-    gpuvendor = (const char*) glGetString(GL_VENDOR);
+    const char* vend = (const char*) glGetString(GL_VENDOR);
+    if (vend)
+      gpuvendor = vend;
   }
   std::transform(gpuvendor.begin(), gpuvendor.end(), gpuvendor.begin(), ::tolower);
   if (firstrun && (!ret || gpuvendor.compare(0, 5, "intel") != 0))