Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix double release in wxGLCanvas code.

Browse Source 
The change in r77699 was partially wrong, we shouldn't release Objective-C
object if initializing it failed.

See #16555.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@77740 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-20 22:06:22 +00:00
parent 495e673859
commit 1f1b1aa0ca
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osx/cocoa/glcanvas.mm
View File

@@ -98,15 +98,14 @@ WXGLPixelFormat WXGLChoosePixelFormat(const int *attribList)
// available. // available.
const NSOpenGLPixelFormatAttribute const NSOpenGLPixelFormatAttribute
attrsAccel[] = { NSOpenGLPFAAccelerated, 0 }; attrsAccel[] = { NSOpenGLPFAAccelerated, 0 };
WXGLPixelFormat testFormat = [NSOpenGLPixelFormat alloc]; if ( WXGLPixelFormat testFormat = [[NSOpenGLPixelFormat alloc]
if ( [testFormat initWithAttributes: attrsAccel] ) initWithAttributes: attrsAccel] )
{ {
// Hardware acceleration is available, use it. // Hardware acceleration is available, use it.
data[p++] = NSOpenGLPFAAccelerated; data[p++] = NSOpenGLPFAAccelerated;
[testFormat release];
} }
[testFormat release];
const NSOpenGLPixelFormatAttribute *attribs; const NSOpenGLPixelFormatAttribute *attribs;
if ( !attribList ) if ( !attribList )
{ {