From 18741bc6ea130a4d66184f834f06f3b2f920f90f Mon Sep 17 00:00:00 2001 From: Philippe Houdoin Date: Wed, 22 Nov 2006 00:09:06 +0000 Subject: [PATCH] * Fixed a crashing bug when no renderer add-on can be found. std::map [] creates a new entry when none can be found! * Disabled libmesa.a being build with DEBUG turn on, as it's broken ATM. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19357 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/opengl/GLRendererRoster.cpp | 6 +++++- src/kits/opengl/mesa/Jamfile | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/kits/opengl/GLRendererRoster.cpp b/src/kits/opengl/GLRendererRoster.cpp index 48ecfa3877..e37449af92 100644 --- a/src/kits/opengl/GLRendererRoster.cpp +++ b/src/kits/opengl/GLRendererRoster.cpp @@ -36,7 +36,11 @@ GLRendererRoster::~GLRendererRoster() BGLRenderer * GLRendererRoster::GetRenderer(int32 id) { - struct renderer_item item = fRenderers[id]; + RendererMap::const_iterator iterator = fRenderers.find(id); + if (iterator == fRenderers.end()) + return NULL; + + struct renderer_item item = iterator->second; return item.renderer; } diff --git a/src/kits/opengl/mesa/Jamfile b/src/kits/opengl/mesa/Jamfile index 5eac12da45..8f67a32749 100644 --- a/src/kits/opengl/mesa/Jamfile +++ b/src/kits/opengl/mesa/Jamfile @@ -7,6 +7,9 @@ if $(TARGET_PLATFORM) != haiku { # We need our not platform one, public GL headers also when not compiling for Haiku. } +# Don't compile libmesa.a with debugging. +DEBUG = 0 ; + UsePrivateHeaders opengl ; UseHeaders [ FDirName $(SUBDIR) main ] ;