diff --git a/Output/Themes/Genius/Screens/ScreenSing.xml b/Output/Themes/Genius/Screens/ScreenSing.xml
index 821093fb..36cebdac 100644
--- a/Output/Themes/Genius/Screens/ScreenSing.xml
+++ b/Output/Themes/Genius/Screens/ScreenSing.xml
@@ -46,7 +46,7 @@
0
- 0
+ 610
1280
90
-0.75
@@ -136,7 +136,7 @@
40
- 10
+ 623
45
36
-1
@@ -1501,7 +1501,7 @@
637
- 7
+ 620
1200
42
-1
@@ -1512,7 +1512,7 @@
637
- 48
+ 662
1200
35
-1
diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index df0648d2..fc09c178 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -532,7 +532,7 @@ namespace Vocaluxe.Screens
_SingNotes[_SingBars].PlayerNotes[j].SetLine(nr);
}
- if (i == 0 && !song.IsDuet || i == 1 && song.IsDuet)
+ if (i == 0)
{
_Lyrics[_LyricMain].SetLine(lines[nr]);
_Lyrics[_LyricMainTop].SetLine(lines[nr]);
@@ -550,7 +550,7 @@ namespace Vocaluxe.Screens
_Lyrics[_LyricSubTop].Clear();
}
}
- if (i == 0 && song.IsDuet)
+ if (i == 1 && song.IsDuet)
{
_Lyrics[_LyricMainDuet].SetLine(lines[nr]);
_TimeToFirstNoteDuet = CGame.GetTimeFromBeats(lines[nr].FirstNoteBeat - lines[nr].StartBeat, song.BPM);
@@ -564,7 +564,7 @@ namespace Vocaluxe.Screens
}
else
{
- if (i == 0 && !song.IsDuet || i == 1 && song.IsDuet)
+ if (i == 0)
{
_Lyrics[_LyricMain].Clear();
_Lyrics[_LyricSub].Clear();
@@ -573,7 +573,7 @@ namespace Vocaluxe.Screens
_TimeToFirstNote = 0f;
}
- if (i == 0 && song.IsDuet)
+ if (i == 1 && song.IsDuet)
{
_Lyrics[_LyricMainDuet].Clear();
_Lyrics[_LyricSubDuet].Clear();
@@ -879,7 +879,7 @@ namespace Vocaluxe.Screens
_Statics[_StaticLyricHelperTop].Color.R,
_Statics[_StaticLyricHelperTop].Color.G,
_Statics[_StaticLyricHelperTop].Color.B,
- _Statics[_StaticLyricHelperTop].Color.A * _Statics[_StaticLyricHelper].Alpha * alpha);
+ _Statics[_StaticLyricHelperTop].Color.A * _Statics[_StaticLyricHelperTop].Alpha * alpha);
float distance = _Lyrics[_LyricMainTop].GetCurrentLyricPosX() - rect.X - rect.W;
CDraw.DrawTexture(_Statics[_StaticLyricHelperTop].Texture,
@@ -1199,8 +1199,8 @@ namespace Vocaluxe.Screens
if (CGame.GetSong() != null && CGame.GetSong().IsDuet)
{
- bottomLyricsVisible = true;
- topLyricsVisible = false;
+ bottomLyricsVisible = false;
+ topLyricsVisible = true;
duetLyricsVisible = true;
}