git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/mixer/gpu/ogl_device.cpp b/core/mixer/gpu/ogl_device.cpp
index 85f9638d598a70b23c9fbda53425927b7230a049..87409ce5c93f016eb554fb30bcaa796f3340a1e4 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -157,13 +157,18 @@ boost::unique_future<void> ogl_device::gc()
 \r
 std::wstring ogl_device::get_version()\r
 {      \r
-       static std::wstring ver;\r
-       if(ver.empty())\r
+       static std::wstring ver = L"Not found";\r
+       try\r
        {\r
-               ogl_device tmp;\r
-               ver = widen(tmp.invoke([]{return std::string(reinterpret_cast<const char*>(glGetString(GL_VERSION)));})\r
-               + " "   + tmp.invoke([]{return std::string(reinterpret_cast<const char*>(glGetString(GL_VENDOR)));}));  \r
+               if(ver.empty())\r
+               {\r
+                       ogl_device tmp;\r
+                       ver = widen(tmp.invoke([]{return std::string(reinterpret_cast<const char*>(glGetString(GL_VERSION)));})\r
+                       + " "   + tmp.invoke([]{return std::string(reinterpret_cast<const char*>(glGetString(GL_VENDOR)));}));  \r
+               }\r
        }\r
+       catch(...){}\r
+\r
        return ver;\r
 }\r
 \r