From b8fb0d754946ef63187ba03c03aca1286005eab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20K=C3=BCpper?= Date: Wed, 22 Nov 2017 20:12:22 +0100 Subject: [PATCH] Make reading HighscoreDB more robust if song entries are incomplete --- Vocaluxe/Lib/Database/CHighscoreDB.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Vocaluxe/Lib/Database/CHighscoreDB.cs b/Vocaluxe/Lib/Database/CHighscoreDB.cs index 35e9fe87..1e0026b5 100644 --- a/Vocaluxe/Lib/Database/CHighscoreDB.cs +++ b/Vocaluxe/Lib/Database/CHighscoreDB.cs @@ -463,10 +463,19 @@ namespace Vocaluxe.Lib.Database if (reader != null && reader.HasRows) { reader.Read(); - artist = reader.GetString(0); - title = reader.GetString(1); - numPlayed = reader.GetInt32(2); - dateAdded = new DateTime(reader.GetInt64(3)); + + if (!reader.IsDBNull(0)) + artist = reader.GetString(0); + + if (!reader.IsDBNull(1)) + title = reader.GetString(1); + + if (!reader.IsDBNull(2)) + numPlayed = reader.GetInt32(2); + + if (!reader.IsDBNull(3)) + dateAdded = new DateTime(reader.GetInt64(3)); + reader.Dispose(); return true; }