From 4a44905f48ed568fd283294aff28eb3f27618162 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 21 Jan 2015 00:41:18 +0100 Subject: [PATCH] Add additional check for GUI shader compilation --- ext/ghoul | 2 +- src/gui/gui.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ext/ghoul b/ext/ghoul index 8e787753ab..627e9a4371 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 8e787753ab54f60c9a74a1ded9ed9191f4b42502 +Subproject commit 627e9a4371d3b9b0159e09fe95eba194820cd5f8 diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 70ac8d5d55..153a7bbdac 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -301,6 +301,10 @@ void GUI::initialize() { void GUI::initializeGL() { _program = ghoul::opengl::ProgramObject::Build("GUI", "${SHADERS}/gui_vs.glsl", "${SHADERS}/gui_fs.glsl"); + if (!_program) { + LERROR("Could not load program object for GUI"); + return; + } positionLocation = glGetAttribLocation(*_program, "in_position"); uvLocation = glGetAttribLocation(*_program, "in_uv");