Merged trunk.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.1.0@2171 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/core/mixer/gpu/accelerator.cpp b/core/mixer/gpu/accelerator.cpp
index 686f260179676f84370c04baeb0383235d0b045e..00c9b3def908e4335fbbc2483540fe52afba349e 100644 (file)
--- a/core/mixer/gpu/accelerator.cpp
+++ b/core/mixer/gpu/accelerator.cpp
@@ -60,9 +60,9 @@ accelerator::accelerator()
                                                \r
                CASPAR_LOG(info) << L"OpenGL " << version();\r
 \r
-               if(!GLEW_VERSION_3_0)\r
-                       CASPAR_LOG(warning) << "Missing OpenGL 3.0 support.";\r
-       \r
+               if(!GLEW_VERSION_3_0)           \r
+                       BOOST_THROW_EXCEPTION(gl::ogl_exception() << msg_info("Your graphics card does not meet the minimum hardware requirements since it does not support OpenGL 3.0 or higher. CasparCG Server will not be able to continue."));\r
+               \r
                glGenFramebuffers(1, &fbo_);    \r
                \r
                CASPAR_LOG(info) << L"Successfully initialized OpenGL Device.";\r

diff --git a/shell/main.cpp b/shell/main.cpp
index 5d854b95d9a19432488ee5d48274da68ffeb0433..a2ed41d90bdb568091dcc49b56fa67e40e14aa2c 100644 (file)
--- a/shell/main.cpp
+++ b/shell/main.cpp
@@ -331,16 +331,14 @@ int main(int argc, wchar_t* argv[])
                CASPAR_LOG(fatal) << L"Unhandled configuration error in main thread. Please check the configuration file (casparcg.config) for errors.";\r
                system("pause");        \r
        }\r
-       catch(caspar::gl::ogl_exception&)\r
-       {\r
-               CASPAR_LOG_CURRENT_EXCEPTION();\r
-               CASPAR_LOG(fatal) << L"Unhandled OpenGL Error in main thread. Please try to update graphics drivers for OpenGL 3.0+ Support.";\r
-       }\r
        catch(...)\r
        {\r
                CASPAR_LOG_CURRENT_EXCEPTION();\r
                CASPAR_LOG(fatal) << L"Unhandled exception in main thread. Please report this error on the CasparCG forums (www.casparcg.com/forum).";\r
-       }       \r
+               Sleep(1000);\r
+               std::wcout << L"\n\nCasparCG will automatically shutdown. See the log file located at the configured log-file folder for more information.\n\n";\r
+               Sleep(4000);\r
+       }               \r
        \r
        return 0;\r
 }
\ No newline at end of file