From d41779b6f2b6cd58348295a793a6ef4a4acd3c72 Mon Sep 17 00:00:00 2001
From: Flamefire <alex@grundis.de>
Date: Sat, 12 Oct 2013 23:31:36 +0200
Subject: [PATCH] Fix wrong comparisons

---
 Vocaluxe/Screens/CScreenSong.cs  | 17 +++++++----------
 Vocaluxe/SongQueue/CSongQueue.cs |  2 +-
 VocaluxeLib/Songs/CSongLoader.cs |  4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs
index 70834067..5c27e577 100644
--- a/Vocaluxe/Screens/CScreenSong.cs
+++ b/Vocaluxe/Screens/CScreenSong.cs
@@ -819,9 +819,8 @@ namespace Vocaluxe.Screens
                 CGame.Reset();
                 CGame.ClearSongs();
 
-                CGame.AddVisibleSong(songNr, gm);
-
-                CGraphics.FadeTo(EScreens.ScreenNames);
+                if (CGame.AddVisibleSong(songNr, gm))
+                    CGraphics.FadeTo(EScreens.ScreenNames);
             }
         }
 
@@ -834,9 +833,8 @@ namespace Vocaluxe.Screens
                 CGame.Reset();
                 CGame.ClearSongs();
 
-                CGame.AddVisibleSong(songNr, gm);
-
-                CGraphics.FadeTo(EScreens.ScreenNames);
+                if (CGame.AddVisibleSong(songNr, gm))
+                    CGraphics.FadeTo(EScreens.ScreenNames);
             }
         }
 
@@ -844,14 +842,13 @@ namespace Vocaluxe.Screens
         {
             if ((CSongs.Category >= 0) && (songNr >= 0))
             {
-                if (CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY))
+                if (!CSongs.VisibleSongs[songNr].IsGameModeAvailable(EGameMode.TR_GAMEMODE_MEDLEY))
                     return;
 
                 CGame.Reset();
                 CGame.ClearSongs();
-                CGame.AddVisibleSong(songNr, EGameMode.TR_GAMEMODE_MEDLEY);
-
-                CGraphics.FadeTo(EScreens.ScreenNames);
+                if (CGame.AddVisibleSong(songNr, EGameMode.TR_GAMEMODE_MEDLEY))
+                    CGraphics.FadeTo(EScreens.ScreenNames);
             }
         }
 
diff --git a/Vocaluxe/SongQueue/CSongQueue.cs b/Vocaluxe/SongQueue/CSongQueue.cs
index 6bbdc664..e2a461cf 100644
--- a/Vocaluxe/SongQueue/CSongQueue.cs
+++ b/Vocaluxe/SongQueue/CSongQueue.cs
@@ -69,7 +69,7 @@ namespace Vocaluxe.SongQueue
 
         private bool _AddSong(int songID, EGameMode gameMode)
         {
-            if (CSongs.GetSong(songID).IsGameModeAvailable(gameMode))
+            if (!CSongs.GetSong(songID).IsGameModeAvailable(gameMode))
                 return false;
 
             _SongQueue.Add(new SSongQueueEntry(songID, gameMode));
diff --git a/VocaluxeLib/Songs/CSongLoader.cs b/VocaluxeLib/Songs/CSongLoader.cs
index 459b554b..ec93c156 100644
--- a/VocaluxeLib/Songs/CSongLoader.cs
+++ b/VocaluxeLib/Songs/CSongLoader.cs
@@ -99,7 +99,7 @@ namespace VocaluxeLib.Songs
                 _LineNr = 0;
                 try
                 {
-                    sr = useSetEncoding ? new StreamReader(filePath, _Song.Encoding, true) : new StreamReader(filePath, true);
+                    sr = new StreamReader(filePath, _Song.Encoding, true);
                     while (!sr.EndOfStream)
                     {
                         string line = sr.ReadLine();
@@ -712,7 +712,7 @@ namespace VocaluxeLib.Songs
                 if (changesMade.IsModified)
                 {
                     string msg = "Automatic changes have been made to " + filePath + " Please check result!\r\n" + changesMade;
-                    CBase.Log.LogError("Warning:" + msg);
+                    CBase.Log.LogError("Warning: " + msg);
                     if (CBase.Config.GetSaveModifiedSongs() == EOffOn.TR_CONFIG_ON)
                     {
                         string name = Path.GetFileNameWithoutExtension(_Song.FileName);