From 7f28adc386923f255a6dc06c3e77166edd06fac8 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@me.com>
Date: Wed, 31 May 2017 17:51:58 -0400
Subject: [PATCH] Add additional trace information Prevent crash if console
 shader is missing

---
 src/engine/openspaceengine.cpp | 12 +++++++++++-
 src/rendering/renderengine.cpp |  2 ++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 7d4be7176f..11de8ea7ab 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -845,10 +845,19 @@ void OpenSpaceEngine::configureLogging() {
 void OpenSpaceEngine::initializeGL() {
     LTRACE("OpenSpaceEngine::initializeGL(begin)");
 
-    _engine->_console->initialize();
+    LTRACE("OpenSpaceEngine::initializeGL::Console::initialize(begin)");
+    try {
+        _engine->_console->initialize();
+    }
+    catch (ghoul::RuntimeError& e) {
+        LERROR("Error initializing Console with error:");
+        LERRORC(e.component, e.message);
+    }
+    LTRACE("OpenSpaceEngine::initializeGL::Console::initialize(end)");
 
     const std::string key = ConfigurationManager::KeyOpenGLDebugContext;
     if (_configurationManager->hasKey(key)) {
+        LTRACE("OpenSpaceEngine::initializeGL::DebugContext(begin)");
         ghoul::Dictionary dict = _configurationManager->value<ghoul::Dictionary>(key);
         bool debug = dict.value<bool>(ConfigurationManager::PartActivate);
 
@@ -949,6 +958,7 @@ void OpenSpaceEngine::initializeGL() {
             };
             ghoul::opengl::debug::setDebugCallback(callback);
         }
+        LTRACE("OpenSpaceEngine::initializeGL::DebugContext(end)");
     }
 
 
diff --git a/src/rendering/renderengine.cpp b/src/rendering/renderengine.cpp
index 88f5b1f775..3b947ea5b2 100644
--- a/src/rendering/renderengine.cpp
+++ b/src/rendering/renderengine.cpp
@@ -271,6 +271,7 @@ void RenderEngine::initialize() {
 }
 
 void RenderEngine::initializeGL() {
+    LTRACE("RenderEngine::initializeGL(begin)");
     // TODO:    Fix the power scaled coordinates in such a way that these 
     //            values can be set to more realistic values
 
@@ -298,6 +299,7 @@ void RenderEngine::initializeGL() {
     ghoul::logging::LogManager::ref().addLog(std::move(log));
 
     LINFO("Finished initializing GL");
+    LTRACE("RenderEngine::initializeGL(end)");
 }
 
 void RenderEngine::deinitialize() {