From 3771cc5dc402d9c0d61b6fb839192b1d4c02db54 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sat, 17 Mar 2012 09:56:26 +0100 Subject: [PATCH] load notes only one time (thx to rayo) --- Vocaluxe/Lib/Song/CSong.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Vocaluxe/Lib/Song/CSong.cs b/Vocaluxe/Lib/Song/CSong.cs index 1327363b..87ba20e7 100644 --- a/Vocaluxe/Lib/Song/CSong.cs +++ b/Vocaluxe/Lib/Song/CSong.cs @@ -25,6 +25,7 @@ namespace Vocaluxe.Lib.Song class CSong { private bool _CoverLoaded = false; + private bool _NotesLoaded = false; private STexture _CoverTextureSmall = new STexture(-1); private STexture _CoverTextureBig = new STexture(-1); @@ -54,7 +55,9 @@ namespace Vocaluxe.Lib.Song { if (!_CoverLoaded) { - this.ReadNotes(); + if (!_NotesLoaded) + this.ReadNotes(); + if (this.CoverFileName != String.Empty) { if (!CDataBase.GetCover(Path.Combine(this.Folder, this.CoverFileName), ref _CoverTextureSmall, CConfig.CoverSize)) @@ -466,6 +469,7 @@ namespace Vocaluxe.Lib.Song CLog.LogError("Error loading song. Line No.: " + FileLineNo.ToString() + ". An unhandled exception occured (" + e.Message + "): " + FilePath); return false; } + _NotesLoaded = true; return true; }