Merge pull request #1248 from dgruss/savescoresonlyonce

Prevent duplicate score saves with multiple screens

Author: barbeque-squared

src/base/UDataBase.pas

@@ -634,7 +634,7 @@ procedure TDataBaseSystem.AddScore(Song: TSong; Level: integer; const Name: UTF8
   if not Assigned(ScoreDB) then
     Exit;
 
-  // Prevent 0 Scores from being added EDIT: ==> UScreenTop5.pas!
+  // Prevent 0 scores from being added. Callers are expected to filter these.
   //if (Score <= 0) then
   //  Exit;
 

src/screens/UScreenTop5.pas

@@ -177,39 +177,22 @@ constructor TScreenTop5.Create;
 procedure TScreenTop5.OnShow;
 var
   I:    integer;
-  sung: boolean; //score added? otherwise in wasn't sung!
   Report: string;
 begin
   inherited;
 
   if not Help.SetHelpID(ID) then
     Log.LogWarn('No Entry for Help-ID ' + ID, 'ScreenTop5');
 
-  sung := false;
   Fadeout := false;
   DifficultyShow := Player[0].Level;
 
-  //ReadScore(CurrentSong);
-
-  for I := 0 to PlayersPlay - 1 do
-  begin
-    if (Player[I].ScoreTotalInt > 0) and (ScreenSing.SungToEnd) then
-    begin
-      DataBase.AddScore(CurrentSong, Player[I].Level, Player[I].Name, Player[I].ScoreTotalInt);
-      sung:=true;
-    end;
-  end;
-
   try
-    if sung then
-    begin
-       DataBase.WriteScore(CurrentSong);
-    end;
     DataBase.ReadScore(CurrentSong);
   except
     on E : Exception do
     begin
-      Report := 'Writing or reading songscore failed in Top-5-creen. Faulty database file?' + LineEnding +
+      Report := 'Reading songscore failed in Top-5-screen. Faulty database file?' + LineEnding +
       'Stacktrace:' + LineEnding;
       if E <> nil then
       begin

src/screens/controllers/UScreenSingController.pas

@@ -83,6 +83,7 @@   TScreenSingController = class(TMenu)
     procedure ResetLinesAndLyrics();
     procedure ClearLyricEngines();
     procedure CalculateStartTime;
+    procedure SaveLocalScores;
   public
     CheckPlayerConfigOnNextSong: boolean;
     eSongLoaded: THookableEvent; //< event is called after lyrics of a song are loaded on OnShow
@@ -1592,14 +1593,20 @@ procedure TScreenSingController.Finish;
   len, num: integer;
 
 begin
+  Log.LogStatus('TScreenSingController.Finish', 'TScreenSingController.Finish');
   AudioInput.CaptureStop;
   AudioPlayback.Stop;
   AudioPlayback.SetSyncSource(nil);
 
-  if (ScreenSong.Mode = smNormal) and (SungToEnd) and (Length(DllMan.Websites) > 0) then
+  if (ScreenSong.Mode = smNormal) and SungToEnd then
   begin
-    AutoSendScore;
-    AutoSaveScore;
+    SaveLocalScores;
+
+    if (Length(DllMan.Websites) > 0) then
+    begin
+      AutoSendScore;
+      AutoSaveScore;
+    end;
   end;
 
   LyricsState.Stop();
@@ -1877,6 +1884,25 @@ procedure TScreenSingController.UpdateMedleyStats(medley_end: boolean);   //TODO
 end;
 
 
+procedure TScreenSingController.SaveLocalScores;
+var
+  I: integer;
+  Sung: boolean;
+begin
+  Sung := false;
+  for I := 0 to PlayersPlay - 1 do
+  begin
+    if Player[I].ScoreTotalInt > 0 then
+    begin
+      DataBase.AddScore(CurrentSong, Player[I].Level, Player[I].Name, Player[I].ScoreTotalInt);
+      Sung := true;
+    end;
+  end;
+
+  if Sung then
+    DataBase.WriteScore(CurrentSong);
+end;
+
 procedure TScreenSingController.AutoSendScore;
 var
   SendInfo: TSendInfo;
@@ -2014,4 +2040,3 @@ procedure TScreenSingController.AutoSaveScore;
 end;
 
 end.
-