From 65ddad359ed3b9b739215ec89a7645455ae10dce Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 5 Oct 2010 18:28:42 +0000
Subject: - added webcam support - faster program start - faster sorting
 (mergesort) - sync lyrics to music - some new backgrounds and credits
 graphics (thx to MezzoX) - own thread for video decoding - finished
 6-Player-on-one-screen-mode - changqed player-colors - fixed some bugs...

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2637 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Screens/UScreenPopup.pas | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Game/Code/Screens/UScreenPopup.pas')

diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index aaed32ed..0169df90 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -126,13 +126,12 @@ begin
                begin
                  if (Display.ActualScreen = @ScreenMain) and (ScreenMain.ShowNumErrors) then
                  begin
-                   Ini.LoadFaultySongs := 1;
+                   Ini.LoadFaultySongs_temp := 1;
                    Songs.LoadSongList();
                    UGraphic.UnLoadScreens();
                    UGraphic.LoadScreens( true );
                    ScreenSong.Refresh(true);
                    PlaylistMan.LoadPlayLists;
-                   Ini.LoadFaultySongs := 0;
                    ScreenMain.ShowNumErrors := false;
                    FadeTo(@ScreenMain);
                  end else
@@ -314,6 +313,9 @@ begin
       SDLK_BACKSPACE :
         begin
           Visible:=False;
+          if (Help.GetHelpID() = ScreenSing.GetHelpID()) then
+            ScreenSing.Pause;
+            
           Result := false;
         end;
 
-- 
cgit v1.2.3