Revert "Fix possible crashes"

This reverts commit a2010ee.
Stellarium · Dec 9, 2023 · 8214683 · 8214683
1 parent a2010ee
commit 8214683
Showing 1 changed file with 25 additions and 26 deletions.
diff --git a/src/core/StelTexture.cpp b/src/core/StelTexture.cpp
@@ -46,36 +46,35 @@ StelTexture::StelTexture(StelTextureMgr *mgr)
 
 StelTexture::~StelTexture()
 {
-	if (id)
+	if (id != 0)
 	{
-		if (id != 0)
-		{
-			/// FS: make sure the correct GL context is bound!
-			/// Causes #595 flicker in Night Mode with DSS/HiPS. Tentatively remove this.
-			//StelApp::getInstance().ensureGLContextCurrent();
+		/// FS: make sure the correct GL context is bound!
+		/// Causes #595 flicker in Night Mode with DSS/HiPS. Tentatively remove this.
+		//StelApp::getInstance().ensureGLContextCurrent();
 
-			if (gl->glIsTexture(id)==GL_FALSE)
-			{
-				GLenum err = gl->glGetError();
-				qWarning() << "WARNING: in StelTexture::~StelTexture() tried to delete invalid texture with ID="
-					   << id << "Current GL ERROR status is" << err << "(" << StelOpenGL::getGLErrorText(err) << ")";
-			}
-			else
-			{
-				gl->glDeleteTextures(1, &id);
-				textureMgr->glMemoryUsage -= glSize;
-				textureMgr->idMap.remove(id);
-				glSize = 0;
-			}
-	#ifndef NDEBUG
-			if (qApp->property("verbose") == true)
-				qDebug() << "Deleted StelTexture" << id << ", total memory usage "
-					 << textureMgr->glMemoryUsage / (1024.0 * 1024.0)<<"MB";
-	#endif
-			id = 0;
+		if (gl->glIsTexture(id)==GL_FALSE)
+		{
+			GLenum err = gl->glGetError();
+			qWarning() << "WARNING: in StelTexture::~StelTexture() tried to delete invalid texture with ID="
+			           << id << "Current GL ERROR status is" << err << "(" << StelOpenGL::getGLErrorText(err) << ")";
 		}
 		else
-			qWarning()<<"Cannot delete texture"<<id<<", no GL context";
+		{
+			gl->glDeleteTextures(1, &id);
+			textureMgr->glMemoryUsage -= glSize;
+			textureMgr->idMap.remove(id);
+			glSize = 0;
+		}
+#ifndef NDEBUG
+		if (qApp->property("verbose") == true)
+			qDebug() << "Deleted StelTexture" << id << ", total memory usage "
+			         << textureMgr->glMemoryUsage / (1024.0 * 1024.0)<<"MB";
+#endif
+		id = 0;
+	}
+	else if (id)
+	{
+		qWarning()<<"Cannot delete texture"<<id<<", no GL context";
 	}
 	if (networkReply)
 	{