Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

Vocaluxe/Base/CDataBase.cs

@@ -748,6 +748,7 @@ namespace Vocaluxe.Base
 
             reader.Dispose();
 
+            SQLiteTransaction _Transaction = connection.BeginTransaction();
             // update Title and Artist strings
             foreach (SData data in songs)
             {
@@ -767,6 +768,7 @@ namespace Vocaluxe.Base
                 command.Parameters.Add("@id", System.Data.DbType.Int32, 0).Value = data.id;
                 command.ExecuteNonQuery();
             }
+            _Transaction.Commit();
 
             //Delete old tables after conversion
             command.CommandText = "DROP TABLE US_Scores;";
@@ -859,7 +861,7 @@ namespace Vocaluxe.Base
             else
             {
                 Sqlite3.Vdbe Stmt = new Sqlite3.Vdbe();
-                res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT ID, Artist, Title FROM US_Songs", -1, ref Stmt, 0);
+                res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT id, Artist, Title FROM Songs", -1, ref Stmt, 0);
 
                 if (res != Sqlite3.SQLITE_OK)
                 {
@@ -898,9 +900,9 @@ namespace Vocaluxe.Base
                 Stmt = new Sqlite3.Vdbe();
 
                 if (!dateExists)
-                    res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT rowid, Player FROM US_Scores", -1, ref Stmt, 0);
+                    res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT id, PlayerName FROM Scores", -1, ref Stmt, 0);
                 else
-                    res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT rowid, Player, Date FROM US_Scores", -1, ref Stmt, 0);
+                    res = Sqlite3.sqlite3_prepare_v2(OldDB, "SELECT id, PlayerName, Date FROM Scores", -1, ref Stmt, 0);
 
                 if (res != Sqlite3.SQLITE_OK)
                 {
@@ -933,9 +935,10 @@ namespace Vocaluxe.Base
                     Sqlite3.sqlite3_finalize(Stmt);
                 }
             }
-
             Sqlite3.sqlite3_close(OldDB);
 
+            SQLiteTransaction _Transaction = connection.BeginTransaction();      
+             
             // update Title and Artist strings
             foreach (SData data in songs)
             {
@@ -944,7 +947,7 @@ namespace Vocaluxe.Base
                 command.Parameters.Add("@artist", System.Data.DbType.String, 0).Value = data.str1;
                 command.Parameters.Add("@id", System.Data.DbType.Int32, 0).Value = data.id;
                 command.ExecuteNonQuery();
-            }
+            }           
 
             // update player names
             foreach (SData data in scores)
@@ -960,6 +963,7 @@ namespace Vocaluxe.Base
                 command.Parameters.Add("@id", System.Data.DbType.Int32, 0).Value = data.id;
                 command.ExecuteNonQuery();
             }
+            _Transaction.Commit();
 
             //Delete old tables after conversion
             command.CommandText = "DROP TABLE US_Scores;";

Vocaluxe/Base/CSettings.cs

@@ -39,10 +39,10 @@ namespace Vocaluxe.Base
 
         public const int iVersionMajor = 0;
         public const int iVersionMinor = 2;      // milestones
-        public const int iVersionSub = 0;        // patches
+        public const int iVersionSub = 1;        // patches
         public const ERevision VersionRevision = ERevision.Release;
 
-        public const int iBuild = 72;             // Increase on every published version! Never Reset!
+        public const int iBuild = 73;             // Increase on every published version! Never Reset!
 
         public const int iDatabaseHighscoreVersion = 2;
         public const int iDatabaseCoverVersion = 1;

Vocaluxe/Screens/CScreenSong.cs

@@ -731,14 +731,16 @@ namespace Vocaluxe.Screens
             }
             else 
             {
-                Buttons[htButtons(ButtonStart)].Visible = false;
-                if(SongMenus[htSongMenus(SongMenu)].IsSmallView())
+                if(_sso.Selection.PartyMode && SongMenus[htSongMenus(SongMenu)].IsSmallView())
                     SongMenus[htSongMenus(SongMenu)].SetSmallView(false);
+
                 for (int i = 0; i < _Base.Settings.GetMaxNumPlayer(); i++)
                 {
                     Buttons[htButtons(ButtonsJoker[i])].Visible = false;
                     Texts[htTexts(TextsPlayer[i])].Visible = false;
                 }
+
+                Buttons[htButtons(ButtonStart)].Visible = false;
             }
 
             return true;