From a8be2e44938cd69b4da43a4752ef2f5d0183cf47 Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Wed, 4 Nov 2015 09:55:01 +1100
Subject: [PATCH] Don't dispose window twice on OSX.

---
 OpenTK/Platform/MacOS/CarbonGLNative.cs   |  2 +-
 OpenTK/Platform/MacOS/CarbonWindowInfo.cs | 22 +---------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/OpenTK/Platform/MacOS/CarbonGLNative.cs b/OpenTK/Platform/MacOS/CarbonGLNative.cs
index 9627b7a76..0b64ea2e6 100644
--- a/OpenTK/Platform/MacOS/CarbonGLNative.cs
+++ b/OpenTK/Platform/MacOS/CarbonGLNative.cs
@@ -110,7 +110,7 @@ namespace OpenTK.Platform.MacOS {
 			API.CheckReturn(err);
 			
 			API.SetWindowTitle(windowRef, title);
-			window = new CarbonWindowInfo(windowRef, this, true);
+			window = new CarbonWindowInfo(windowRef, this);
 			SetLocation(r.X, r.Y);
 			SetSize(r.Width, r.Height);
 
diff --git a/OpenTK/Platform/MacOS/CarbonWindowInfo.cs b/OpenTK/Platform/MacOS/CarbonWindowInfo.cs
index 9d0e8f62a..6f8e46512 100644
--- a/OpenTK/Platform/MacOS/CarbonWindowInfo.cs
+++ b/OpenTK/Platform/MacOS/CarbonWindowInfo.cs
@@ -34,16 +34,14 @@ namespace OpenTK.Platform.MacOS {
 	sealed class CarbonWindowInfo : IWindowInfo {
 		
 		public IntPtr WindowRef;
-		bool ownHandle = false;
 		bool disposed = false;
 		internal bool goFullScreenHack = false;
 		internal bool goWindowedHack = false;
 		internal CarbonGLNative nativeWindow;
 
-		public CarbonWindowInfo( IntPtr windowRef, CarbonGLNative nativeWindow, bool ownHandle ) {
+		public CarbonWindowInfo( IntPtr windowRef, CarbonGLNative nativeWindow ) {
 			this.WindowRef = windowRef;
 			this.nativeWindow = nativeWindow;
-			this.ownHandle = ownHandle;
 		}
 
 		public override string ToString() {
@@ -56,24 +54,6 @@ namespace OpenTK.Platform.MacOS {
 		}
 
 		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);
 		}
 	}
 }