merged lua into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2071 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 10 insertions, 9 deletions

diff --git a/src/screens/UScreenMain.pas b/src/screens/UScreenMain.pas
index ca4ba7cc..b342281c 100644
--- a/src/screens/UScreenMain.pas
+++ b/src/screens/UScreenMain.pas
@@ -153,12 +153,7 @@ begin
         begin
           if (Songs.SongList.Count >= 1) then
           begin
-            if (Length(DLLMan.Plugins) >= 1) then
-            begin
-              FadeTo(@ScreenPartyOptions, SoundLib.Start);
-            end
-            else //show error message, No Plugins Loaded
-              ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));
+            FadeTo(@ScreenPartyOptions, SoundLib.Start);
           end
           else //show error message, No Songs Loaded
             ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_SONGS'));
@@ -241,12 +236,18 @@ procedure TScreenMain.OnShow;
 begin
   inherited;
 
+ {**
+  * Clean up TPartyGame here
+  * at the moment there is no better place for this
+  *}
+  Party.Clear;
+
   { display cursor (on moved) }
   Display.SetCursor;
 
-{**
- * Start background music
- *}
+ {**
+  * Start background music
+  *}
   SoundLib.StartBgMusic;
 end;