AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-14 18:15:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't dispose window twice on OSX.

Browse Source
This commit is contained in:
UnknownShadow200 2015-11-04 09:55:01 +11:00
parent d71efc2b7c
commit a8be2e4493
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenTK/Platform/MacOS/CarbonGLNative.cs
View File

@ -110,7 +110,7 @@ namespace OpenTK.Platform.MacOS {
API.CheckReturn(err); API.CheckReturn(err);
API.SetWindowTitle(windowRef, title); API.SetWindowTitle(windowRef, title);
window = new CarbonWindowInfo(windowRef, this, true); window = new CarbonWindowInfo(windowRef, this);
SetLocation(r.X, r.Y); SetLocation(r.X, r.Y);
SetSize(r.Width, r.Height); SetSize(r.Width, r.Height);

22
OpenTK/Platform/MacOS/CarbonWindowInfo.cs
View File

@ -34,16 +34,14 @@ namespace OpenTK.Platform.MacOS {
sealed class CarbonWindowInfo : IWindowInfo { sealed class CarbonWindowInfo : IWindowInfo {
public IntPtr WindowRef; public IntPtr WindowRef;
bool ownHandle = false;
bool disposed = false; bool disposed = false;
internal bool goFullScreenHack = false; internal bool goFullScreenHack = false;
internal bool goWindowedHack = false; internal bool goWindowedHack = false;
internal CarbonGLNative nativeWindow; internal CarbonGLNative nativeWindow;
public CarbonWindowInfo( IntPtr windowRef, CarbonGLNative nativeWindow, bool ownHandle ) { public CarbonWindowInfo( IntPtr windowRef, CarbonGLNative nativeWindow ) {
this.WindowRef = windowRef; this.WindowRef = windowRef;
this.nativeWindow = nativeWindow; this.nativeWindow = nativeWindow;
this.ownHandle = ownHandle;
} }
public override string ToString() { public override string ToString() {
@ -56,24 +54,6 @@ namespace OpenTK.Platform.MacOS {
} }
public void Dispose() { public void Dispose() {
Dispose(true);
}
void Dispose(bool disposing) {
if (disposed)
return;
if (ownHandle) {
Debug.Print("Disposing window {0}.", WindowRef);
Carbon.API.DisposeWindow(this.WindowRef);
WindowRef = IntPtr.Zero;
}
disposed = true;
}
~CarbonWindowInfo() {
Dispose(false);
} }
} }
} }