Merge branch 'develop' of github.com:Flamefire/Vocaluxe into sound-player

Conflicts:
	VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

VocaluxeLib/Menu/SongMenu/CSongMenuFramework.cs

@@ -442,6 +442,7 @@ namespace VocaluxeLib.Menu.SongMenu
                 _SelectionNr = categoryNr;
             else
                 _SelectionNr = -1;
+            _PreviewNr = _SelectionNr;
         }
 
         public virtual void UnloadTextures() {}
@@ -519,6 +520,11 @@ namespace VocaluxeLib.Menu.SongMenu
         protected void _ResetPreview()
         {
             CBase.PreviewPlayer.Stop();
+
+            //Make sure we don't have a preview here otherwise a change won't be recognized
+            //(e.g. leave a category with one song and set preview to 0 --> previewOld=previewNew=0 --> No change --> Old data shown
+            //Use internal nr because this function gets called from withing setPreviewNr
+            _PreviewNrInternal = -1;
         }
 
         #region ThemeEdit