From 64dcc387e7fea4458d5f4b08da78da2dbd421527 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Mon, 7 May 2012 15:07:22 +0200 Subject: [PATCH] added handling for empty highscore names --- Vocaluxe/Base/CDataBase.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Base/CDataBase.cs b/Vocaluxe/Base/CDataBase.cs index e1040bf8..53ef0cc8 100644 --- a/Vocaluxe/Base/CDataBase.cs +++ b/Vocaluxe/Base/CDataBase.cs @@ -797,10 +797,16 @@ namespace Vocaluxe.Base data.id = Sqlite3.sqlite3_column_int(Stmt, 0); byte[] bytes = Sqlite3.sqlite3_column_rawbytes(Stmt, 1); - data.str1 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes)); + if (bytes != null) + data.str1 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes)); + else + data.str1 = "Someone"; bytes = Sqlite3.sqlite3_column_rawbytes(Stmt, 2); - data.str2 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes)); + if (bytes != null) + data.str2 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes)); + else + data.str2 = "Someone"; songs.Add(data); } @@ -832,7 +838,10 @@ namespace Vocaluxe.Base data.id = Sqlite3.sqlite3_column_int(Stmt, 0); byte[] bytes = Sqlite3.sqlite3_column_rawbytes(Stmt, 1); - data.str1 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes)); + if (bytes != null) + data.str1 = UTF8.GetString(Encoding.Convert(CP1252, UTF8, bytes)); + else + data.str1 = "Someone"; if (dateExists) data.ticks = UnixTimeToTicks(Sqlite3.sqlite3_column_int(Stmt, 2));