Fix disposing of ShaderProgramCache

Fixes issues #1071, #1181 Also fixes project templates for Windows and Linux to always dispose of the Game object.
MonoGame · Jan 15, 2013 · 9674564 · 9674564
1 parent cee468f
commit 9674564
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/MonoGame.Framework/Graphics/Shader/ShaderProgramCache.cs b/MonoGame.Framework/Graphics/Shader/ShaderProgramCache.cs
@@ -143,7 +143,8 @@ protected virtual void Dispose(bool disposing)
         {
             if (!disposed)
             {
-                Clear();
+                if (disposing)
+                    Clear();
                 disposed = true;
             }
         }

diff --git a/ProjectTemplates/VisualStudio2010/Linux/Program.cs b/ProjectTemplates/VisualStudio2010/Linux/Program.cs
@@ -6,21 +6,21 @@
 
 namespace $safeprojectname$
 {
+#ifdef WINDOWS || LINUX
     /// <summary>
     /// The main class.
     /// </summary>
     public static class Program
     {
-        private static Game1 game;
-
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
         {
-            game = new Game1();
-            game.Run();
+            using (var game = new Game1())
+                game.Run();
         }
     }
+#endif
 }
diff --git a/ProjectTemplates/VisualStudio2010/WindowsGL/Program.cs b/ProjectTemplates/VisualStudio2010/WindowsGL/Program.cs
@@ -6,21 +6,21 @@
 
 namespace $safeprojectname$
 {
+#ifdef WINDOWS || LINUX
     /// <summary>
     /// The main class.
     /// </summary>
     public static class Program
     {
-        private static Game1 game;
-
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
         [STAThread]
         static void Main()
         {
-            game = new Game1();
-            game.Run();
+            using (var game = new Game1())
+                game.Run();
         }
     }
+#endif
 }