From 918cb99c7f4532d52aa37c59e295b5a78ebe5d6a Mon Sep 17 00:00:00 2001 From: janwas Date: Wed, 25 Aug 2004 11:44:11 +0000 Subject: [PATCH] now verify glActiveTexture != 0 in GL extension check (in response to bug #18) This was SVN commit r1055. --- source/main.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/main.cpp b/source/main.cpp index 1942126b74..ec7a966c39 100755 --- a/source/main.cpp +++ b/source/main.cpp @@ -858,7 +858,9 @@ sle(11340106); write_sys_info(); - if(!oglExtAvail("GL_ARB_multitexture") || !oglExtAvail("GL_ARB_texture_env_combine")) + if(!oglExtAvail("GL_ARB_multitexture") || !oglExtAvail("GL_ARB_texture_env_combine") || + !glActiveTexture) // prevent crashing later if multitexture support is falsely + // advertised (janwas 2004-08-25, for bug #18) { LOG(ERROR, LOG_CATEGORY, "Required ARB_multitexture or ARB_texture_env_combine extension not available"); throw PSERROR_System_RequiredExtensionsMissing();