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 0688e3f7bd11c2016dbb54c9d08d925467e7039e..4ebc5bb3b0a5dfe8a1ad0d439d3ecb5f528081b2 100644 (file)
--- a/core/mixer/gpu/ogl_device.cpp
+++ b/core/mixer/gpu/ogl_device.cpp
@@ -261,9 +261,9 @@ std::wstring ogl_device::get_version()
        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
+               auto tmp = ogl_device::create();\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
        catch(...){}\r
 \r

diff --git a/shell/main.cpp b/shell/main.cpp
index a00077db8b07dc1e0cad75228a6a7c4b253d25b3..7e8d6edaa4512fe5d835350f45231160bfb3c50a 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -173,7 +173,7 @@ void print_info()
        CASPAR_LOG(info) << L"FFMPEG-avfilter " << caspar::ffmpeg::get_avfilter_version();\r
        CASPAR_LOG(info) << L"FFMPEG-avutil "   << caspar::ffmpeg::get_avutil_version();\r
        CASPAR_LOG(info) << L"FFMPEG-swscale "  << caspar::ffmpeg::get_swscale_version();\r
-       //CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n"; // Dead-locks for some reason?\r
+       //CASPAR_LOG(info) << L"OpenGL " << caspar::core::ogl_device::get_version() << "\n\n";\r
 }\r
 \r
 LONG WINAPI UserUnhandledExceptionFilter(EXCEPTION_POINTERS* info)\r