Skip to content

Commit 12f7dde

Browse files
Fixed incorrect object deallocation order when the deallocation method requires -self-.
1 parent e6c9dc9 commit 12f7dde

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/EGL/drivers/eagl/egl_eagl_ios_eaglcontext.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ @implementation __EAGLIOSContext
2929
@synthesize nativeSharedGroup;
3030

3131
- (void)dealloc {
32-
METHOD_DEALLOC(super);
3332
OWNERSHIP_RELEASE(nativeContext);
3433
OWNERSHIP_RELEASE(nativeSharedGroup);
34+
METHOD_DEALLOC(super);
3535
}
3636

3737
@end

src/EGL/drivers/eagl/egl_eagl_ios_eaglsurface.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ - (id)init {
9696
}
9797

9898
- (void)dealloc {
99-
METHOD_DEALLOC(super);
10099
OWNERSHIP_RELEASE((id<NSObject>) _windowSurface);
101100
OWNERSHIP_RELEASE((id<NSObject>) _pixmapSurface);
102101
OWNERSHIP_RELEASE((id<NSObject>) _pbufferSurface);
103102
[self setupVideoFrameIntervalUpdates:0];
104103
OWNERSHIP_RELEASE((id<NSObject>) displayLink);
105104
OWNERSHIP_RELEASE((id<NSObject>) condition);
105+
METHOD_DEALLOC(super);
106106
}
107107

108108
- (void) setupVideoFrameIntervalUpdates:(NSUInteger) frameInterval {

src/EGL/drivers/eagl/egl_eagl_ios_eaglwindow.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ - (id)init
3838

3939
- (void)dealloc
4040
{
41-
METHOD_DEALLOC(super);
4241
OWNERSHIP_RELEASE(window);
42+
METHOD_DEALLOC(super);
4343
}
4444

4545
@end

0 commit comments

Comments
 (0)