X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=95f7a05b7e64c6abe46c83ea57e7adfb6a23adf0;hp=7f6f077e294268b3281719c571114d08fcbea263;hb=8b3ce77b133bbac9979e75a6c88f6b86559d2705;hpb=fb11663a3654acd0132e71e5652e35b0ea72d544

diff --git a/src/app.cc b/src/app.cc
index 7f6f077..95f7a05 100644
--- a/src/app.cc
+++ b/src/app.cc
@@ -95,11 +95,14 @@ bool app_init(int argc, char **argv)
 		goatvr_recenter();
 	}
 
-	int srgb_capable;
-	glGetIntegerv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT, &srgb_capable);
-	printf("Framebuffer %s sRGB-capable\n", srgb_capable ? "is" : "is not");
-	fb_srgb = srgb_capable != 0;
-	glEnable(GL_FRAMEBUFFER_SRGB);
+	if(fb_srgb) {
+		int srgb_capable;
+		glGetIntegerv(GL_FRAMEBUFFER_SRGB_CAPABLE_EXT, &srgb_capable);
+		printf("Framebuffer %s sRGB-capable\n", srgb_capable ? "is" : "is not");
+		if(srgb_capable) {
+			glEnable(GL_FRAMEBUFFER_SRGB);
+		}
+	}
 
 	glEnable(GL_MULTISAMPLE);
 	glEnable(GL_DEPTH_TEST);
@@ -169,7 +172,7 @@ bool app_init(int argc, char **argv)
 		app_grab_mouse(true);
 	}
 
-	if(mscn->music) {
+	if(mscn->music && opt.music) {
 		mscn->music->play(AUDIO_PLAYMODE_LOOP);
 	}
 	return true;