From e963b7538e8ce9fbd706e035e53ab8aef53dae77 Mon Sep 17 00:00:00 2001
From: Anakin <Battlefrontler@t-online.de>
Date: Thu, 5 Jan 2017 16:18:01 +0100
Subject: [PATCH] fixed texture problem

---
 QtMeshViewer/Source/GeometryEngine.cpp | 4 +++-
 QtMeshViewer/Source/MainWindow.cpp     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/QtMeshViewer/Source/GeometryEngine.cpp b/QtMeshViewer/Source/GeometryEngine.cpp
index 9c7e133..ca81f29 100644
--- a/QtMeshViewer/Source/GeometryEngine.cpp
+++ b/QtMeshViewer/Source/GeometryEngine.cpp
@@ -107,6 +107,7 @@ void GeometryEngine::loadFile(const char* filePath)
 	}
 	catch (std::invalid_argument e)
 	{
+		clearData();
 		emit sendMessage(QString(e.what()), 2);
 	}
 }
@@ -126,7 +127,7 @@ void GeometryEngine::loadTexture(const char* filePath, const char* fileName)
 		img = loadTga((std::string(filePath) + std::string(fileName)).c_str(), loadSuccess);
 
 	//TODO: emit if not successfull
-	if (loadSuccess)
+	if (!loadSuccess)
 	{
 		QString msg = "WARNING: texture not found or corrupted: ";
 		msg += QString(fileName);
@@ -205,6 +206,7 @@ void GeometryEngine::drawGeometry(QOpenGLShaderProgram *program)
 
 	for (auto& it : m_drawList)
 	{
+		Q_ASSERT(!m_textures.isEmpty());
 		// bind the correct texture
 		if (it.textureIndex < m_textures.size())
 			m_textures.at(it.textureIndex)->bind();
diff --git a/QtMeshViewer/Source/MainWindow.cpp b/QtMeshViewer/Source/MainWindow.cpp
index 181463a..b4ca5b2 100644
--- a/QtMeshViewer/Source/MainWindow.cpp
+++ b/QtMeshViewer/Source/MainWindow.cpp
@@ -122,7 +122,7 @@ void MainWindow::aboutTool()
 
 void MainWindow::printMessage(QString message, int severity)
 {
-	if (severity < m_curSeverity)
+	if (!ui->statusBar->currentMessage().isEmpty() && severity < m_curSeverity)
 		return;
 
 	m_curSeverity = severity;