X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fui%2Fgl%2Fgl_context_wgl.cc;h=abe47e4f9f7a78be1c32d3c02689e191314ce344;hb=004985e17e624662a4c85c76a7654039dc83f028;hp=41f1b6349e027c24fedf7a190db21e0b2bda93db;hpb=2f108dbacb161091e42a3479f4e171339b7e7623;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/ui/gl/gl_context_wgl.cc b/src/ui/gl/gl_context_wgl.cc
index 41f1b63..abe47e4 100644
--- a/src/ui/gl/gl_context_wgl.cc
+++ b/src/ui/gl/gl_context_wgl.cc
@@ -74,6 +74,7 @@ bool GLContextWGL::MakeCurrent(GLSurface* surface) {
   if (IsCurrent(surface))
     return true;
 
+  ScopedReleaseCurrent release_current;
   TRACE_EVENT0("gpu", "GLContextWGL::MakeCurrent");
 
   if (!wglMakeCurrent(static_cast<HDC>(surface->GetHandle()), context_)) {
@@ -86,7 +87,6 @@ bool GLContextWGL::MakeCurrent(GLSurface* surface) {
 
   SetCurrent(surface);
   if (!InitializeDynamicBindings()) {
-    ReleaseCurrent(surface);
     return false;
   }
 
@@ -95,6 +95,7 @@ bool GLContextWGL::MakeCurrent(GLSurface* surface) {
     return false;
   }
 
+  release_current.Cancel();
   return true;
 }