From 4045293f9d23d4c0f5a68c96813436cfa3a86fc2 Mon Sep 17 00:00:00 2001
From: Robin Dunn <robin@alldunn.com>
Date: Thu, 10 May 2012 22:39:02 +0000
Subject: [PATCH] Acquire the GIL before checking for an error

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@71406 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 etg/bitmap.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/etg/bitmap.py b/etg/bitmap.py
index ab3bb220..338816c3 100644
--- a/etg/bitmap.py
+++ b/etg/bitmap.py
@@ -228,10 +228,12 @@ def run():
         body="""\
             wxBitmap* bmp = new wxBitmap(width, height, 24);
             wxPyCopyBitmapFromBuffer(bmp, (byte*)data->m_ptr, data->m_len, wxBitmapBufferFormat_RGB);
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();
             if (PyErr_Occurred()) {
                 delete bmp;
                 bmp = NULL;
             }
+            wxPyEndBlockThreads(blocked);
             return bmp;
             """)
 
@@ -269,10 +271,12 @@ def run():
         body="""\
             wxBitmap* bmp = new wxBitmap(width, height, 32);
             wxPyCopyBitmapFromBuffer(bmp, (byte*)data->m_ptr, data->m_len, wxBitmapBufferFormat_RGBA);
+            wxPyBlock_t blocked = wxPyBeginBlockThreads();            
             if (PyErr_Occurred()) {
                 delete bmp;
                 bmp = NULL;
             }
+            wxPyEndBlockThreads(blocked);
             return bmp;
             """)