- divide ScreenW by 2 in modi list if screens=2 and fullscreen (UIni)

- fixed crash after singing (with screens=2)

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

2 files changed, 5 insertions, 4 deletions

diff --git a/src/base/UIni.pas b/src/base/UIni.pas
index b198f22c..6dd2956d 100644
--- a/src/base/UIni.pas
+++ b/src/base/UIni.pas
@@ -841,7 +841,7 @@ begin
     begin
       Log.LogStatus( 'Found Video Mode : ' + IntToStr(Modes^.w) + 'x' + IntToStr(Modes^.h) , 'Video');
       SetLength(IResolution, Length(IResolution) + 1);
-      IResolution[High(IResolution)] := IntToStr(Modes^.w) + 'x' + IntToStr(Modes^.h);
+      IResolution[High(IResolution)] := IntToStr(Modes^.w div (Screens+1)) + 'x' + IntToStr(Modes^.h);
       Inc(Modes);
     end;
 
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas
index 3e0d8078..b0318072 100644
--- a/src/screens/UScreenSing.pas
+++ b/src/screens/UScreenSing.pas
@@ -230,8 +230,8 @@ begin
         //Sound[0].BufferLong
 
         Finish;
+        FadeOut := true;
         AudioPlayback.PlaySound(SoundLib.Back);
-        FadeTo(@ScreenScore);
       end;
 
       SDLK_SPACE:
@@ -884,7 +884,7 @@ begin
     end
     else
     begin
-      if (not FadeOut) then
+      if (not FadeOut) and (Screens=1) or (ScreenAct=2) then
       begin
         Finish;
         FadeOut := true;
@@ -942,7 +942,8 @@ begin
 
   SetFontItalic(false);
 
-  Party.CallAfterSing;
+  if not FadeOut then
+    Party.CallAfterSing;
 end;
 
 procedure TScreenSing.OnSentenceEnd(SentenceIndex: cardinal);