diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp
index c962a81..3ad2e09 100644
--- a/src/rw/TexRead.cpp
+++ b/src/rw/TexRead.cpp
@@ -223,7 +223,7 @@ RwTextureGtaStreamRead(RwStream *stream)
 	if (gGameState == GS_INIT_PLAYING_GAME) {
 		texLoadTime = (texNumLoaded * texLoadTime + (float)CTimer::GetCurrentTimeInCycles() / (float)CTimer::GetCyclesPerMillisecond() - preloadTime) / (float)(texNumLoaded+1);
 		texNumLoaded++;
-	} else /*if (gGameState != GS_PLAYING_GAME)*/ {
+	} else if (gGameState != GS_PLAYING_GAME || FrontEndMenuManager.m_bMenuActive) {
 		if (tex != nil && tex->raster != nil && RwRasterGetWidth(tex->raster) > 128 || RwRasterGetHeight(tex->raster) > 128) {
 //			debug("downscaling %s", tex->name);
 			downscaleTexture(tex);
diff --git a/vendor/librw/src/rwbase.h b/vendor/librw/src/rwbase.h
index 422de74..45285b7 100644
--- a/vendor/librw/src/rwbase.h
+++ b/vendor/librw/src/rwbase.h
@@ -21,7 +21,9 @@
 // TODO: clean up the opengl defines
 //       and figure out what we even want here...
 #ifdef RW_GL3
+#ifndef RW_OPENGL
 #define RW_OPENGL
+#endif
 #define RWDEVICE gl3
 // doesn't help
 //#define RW_GL_USE_VAOS