From 490fbc4869e9ace2c13a8c52f557b0e0b79eb9cd Mon Sep 17 00:00:00 2001
From: jonasstrandstedt <jonas.strandstedt@gmail.com>
Date: Tue, 21 Oct 2014 21:44:29 +0200
Subject: [PATCH] Linux fix

---
 ext/ghoul                                               | 2 +-
 include/openspace/rendering/renderablewavefrontobject.h | 4 ++--
 src/abuffer/abuffer.cpp                                 | 1 -
 src/engine/openspaceengine.cpp                          | 3 ++-
 src/rendering/renderablewavefrontobject.cpp             | 8 ++++++++
 src/rendering/stars/renderablestars.cpp                 | 4 ++++
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 999399a275..68c53264aa 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 999399a27548c4adf5267d1569af4edb5f794658
+Subproject commit 68c53264aaf05e1fc9526a857ac38db2d620557e
diff --git a/include/openspace/rendering/renderablewavefrontobject.h b/include/openspace/rendering/renderablewavefrontobject.h
index c0370d1a25..4785c18451 100644
--- a/include/openspace/rendering/renderablewavefrontobject.h
+++ b/include/openspace/rendering/renderablewavefrontobject.h
@@ -78,8 +78,8 @@ private:
 	GLenum _mode;
 	unsigned int _isize;
 	unsigned int _vsize;
-	Vertex *_varray;
-	int *_iarray;
+	Vertex* _varray;
+	int* _iarray;
 
 	glm::dmat3 _stateMatrix; // might need this
 
diff --git a/src/abuffer/abuffer.cpp b/src/abuffer/abuffer.cpp
index 45adb1274a..714df95445 100644
--- a/src/abuffer/abuffer.cpp
+++ b/src/abuffer/abuffer.cpp
@@ -114,7 +114,6 @@ bool ABuffer::reinitialize() {
 
 void ABuffer::resolve() {
 	if( ! _validShader) {
-		SleepEx(0, TRUE);
 		generateShaderSource();
 		updateShader();
 		_validShader = true;
diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp
index 09296ef4bd..eb68261a24 100644
--- a/src/engine/openspaceengine.cpp
+++ b/src/engine/openspaceengine.cpp
@@ -323,7 +323,8 @@ bool OpenSpaceEngine::create(int argc, char** argv,
 		if (!FileSys.directoryExists(token)) {
 			std::string p = absPath(token);
 			LDEBUG("Directory '" << p <<"' does not exsist, creating.");
-			FileSys.createDirectory(p, true);
+			if(FileSys.createDirectory(p, true))
+				LERROR("Directory '" << p <<"' could not be created");
 		}
 	}
 
diff --git a/src/rendering/renderablewavefrontobject.cpp b/src/rendering/renderablewavefrontobject.cpp
index a972435a1b..1dfb81e42c 100644
--- a/src/rendering/renderablewavefrontobject.cpp
+++ b/src/rendering/renderablewavefrontobject.cpp
@@ -51,6 +51,10 @@ RenderableWavefrontObject::RenderableWavefrontObject(const ghoul::Dictionary& di
     , _programObject(nullptr)
 	, _fovProgram(nullptr)
     , _texture(nullptr)
+    , _isize(0)
+    , _vsize(0)
+    , _varray(nullptr)
+    , _iarray(nullptr)
 {
 	std::string name;
 	bool success = dictionary.getValue(constants::scenegraphnode::keyName, name);
@@ -108,6 +112,7 @@ void RenderableWavefrontObject::loadObj(const char *filename){
 	fi = fopen(filename, "r");
 	if (fi == NULL) {
 		LERROR("Null Object\n");
+
 	}
 	while (fgets(line, 150, fi) != NULL)
 	{
@@ -256,6 +261,9 @@ RenderableWavefrontObject::~RenderableWavefrontObject(){
 
 bool RenderableWavefrontObject::initialize()
 {
+	if(_isize == 0)
+		return false;
+
     bool completeSuccess = true;
     if (_programObject == nullptr)
         completeSuccess
diff --git a/src/rendering/stars/renderablestars.cpp b/src/rendering/stars/renderablestars.cpp
index ac210c8192..7b4dc96e1a 100644
--- a/src/rendering/stars/renderablestars.cpp
+++ b/src/rendering/stars/renderablestars.cpp
@@ -292,6 +292,10 @@ bool RenderableStars::deinitialize(){
 
 //#define TMAT
 void RenderableStars::render(const RenderData& data){
+	if(!_haloProgram)
+		return;
+	if(!_texture)
+		return;
 	assert(_haloProgram);
 	//printOpenGLError();
 	// activate shader