From: José Fonseca <jose.r.fonseca@gmail.com>
Date: Sat, 27 Oct 2012 11:31:59 +0000 (+0100)
Subject: Merge branch 'master' into mt-trace
X-Git-Url: https://git.cworth.org/git?p=apitrace;a=commitdiff_plain;h=aa135d6ca5642fb2e5c807a1d4df96f5d6b07c98

Merge branch 'master' into mt-trace
---

aa135d6ca5642fb2e5c807a1d4df96f5d6b07c98
diff --cc retrace/glretrace_egl.cpp
index 79b1621,10c950b..4585564
--- a/retrace/glretrace_egl.cpp
+++ b/retrace/glretrace_egl.cpp
@@@ -203,7 -202,10 +203,11 @@@ static void retrace_eglDestroyContext(t
      it = context_map.find(orig_context);
  
      if (it != context_map.end()) {
-         delete it->second;
++        glretrace::Context *currentContext = glretrace::getCurrentContext();
+         if (it->second != currentContext) {
+             // TODO: reference count
+             delete it->second;
+         }
          context_map.erase(it);
      }
  }