Merge remote-tracking branch 'origin/ottd'

diff --cc Crow.csproj
Simple merge

diff --cc OTKCrow/OpenTKGameWindow.cs
index 8f1f0156f8b991aa1d6f8f4b53534c8a854266e1,a073d6958551c3504b191fa23fb723834c59ba49..a5ec72bdebf6fb27f1542d1381e03f67ea379a50
--- 1/OTKCrow/OpenTKGameWindow.cs
--- 2/OTKCrow/OpenTKGameWindow.cs
+++ b/OTKCrow/OpenTKGameWindow.cs
@@@ -183,8 -195,16 +183,12 @@@ namespace Cro
                }
                void OpenGLDraw()
                {
 -                      GL.GetInteger (GetPName.Viewport, viewport);
+                       bool blend = GL.GetBoolean (GetPName.Blend);
 -
+                       GL.Enable (EnableCap.Blend);
 -                      GL.Viewport (0, 0, ClientRectangle.Width, ClientRectangle.Height);
+                       GL.DepthMask (false);
+                       GL.Disable (EnableCap.DepthTest);
                        shader.Enable ();
 +                      GL.BindTexture (TextureTarget.Texture2D, texID);
                        lock (CrowInterface.RenderMutex) {
                                if (CrowInterface.IsDirty) {
                                        GL.TexSubImage2D (TextureTarget.Texture2D, 0,
@@@ -194,8 -214,17 +198,13 @@@
                                        CrowInterface.IsDirty = false;
                                }
                        }
 -
 -                      uiQuad.Render (PrimitiveType.TriangleStrip);
 +                      quad.Render (PrimitiveType.TriangleStrip);
                        GL.BindTexture(TextureTarget.Texture2D, 0);
 -
+                       shader.Disable ();
+                       if (!blend)
+                               GL.Disable (EnableCap.Blend);
 -                      GL.Viewport (viewport [0], viewport [1], viewport [2], viewport [3]);
 -
+                       GL.DepthMask (true);
+                       GL.Enable (EnableCap.DepthTest);
                }
                #endregion
  

diff --cc src/GraphicObjects/Window.cs
index 2bfa69214817483c40a5b714165583f6ad08bf6c,94fe40d33063613f306ee5309b4f93074461e9dc..31e5da2f25c391b180b95f7b2f636ce05afd7997
--- 1/src/GraphicObjects/Window.cs
--- 2/src/GraphicObjects/Window.cs
+++ b/src/GraphicObjects/Window.cs
@@@ -223,7 -214,12 +225,12 @@@ namespace Cro
  
                protected void butQuitPress (object sender, MouseButtonEventArgs e)
                {
 -
 +                      Interface.CurrentInterface.MouseCursor = XCursor.Default;
+                       close ();
+               }
+ 
+               void close(){
+                       Closing.Raise (this, null);
                        Interface.CurrentInterface.DeleteWidget (this);
                }