proper splash screen loading as well as proper unloading assets for end of game finished.

RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentSystem.cs

@@ -34,7 +34,8 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
             try
             {
                 assets.Add(assetName, contentManager.Load<IDisposable>(path));
-            } catch (ContentLoadException cle)
+            }
+            catch (ContentLoadException cle)
             {
                 Debug.WriteLine("Failed to load " + assetName + "with modified path: " + cle.Message);
                 Debug.WriteLine("Loading asset from root: " + assetName);
@@ -99,10 +100,13 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
         /// <param name="name">the string name used to load the asset</param>
         public void Remove(string name)
         {
-            if (assets.ContainsKey(name))
+            lock (queue)
             {
-                assets[name].Dispose();
-                assets.Remove(name);
+                if (assets.ContainsKey(name))
+                {
+                    assets[name].Dispose();
+                    assets.Remove(name);
+                }
             }
         }
 
@@ -122,12 +126,12 @@ namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
         /// </summary>
         public void UnloadAll()
         {
-            foreach (KeyValuePair<string, IDisposable> asset in assets)
+            lock (queue)
             {
-                asset.Value.Dispose();
-                assets.Remove(asset.Key);
+                contentManager.Unload();
+                assets.Clear();
+                ClearQueue();
             }
-            ClearQueue();
         }
 
         public bool Done