From 8d50d9f8d1fcda6e0e99a92d253ee622cfc36fe9 Mon Sep 17 00:00:00 2001
From: Jiiniasu <jiiniasu@gief.info>
Date: Mon, 6 Nov 2017 20:03:27 +0100
Subject: [PATCH] Clean up code a bit

---
 VocaluxeLib/Menu/SongMenu/CSongMenuList.cs    | 28 ++++++++-----------
 .../Menu/SongMenu/CSongMenuTileBoard.cs       | 28 ++++++++-----------
 2 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
index 207ec31a..58de1560 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuList.cs
@@ -364,10 +364,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     if (_SelectionNr > 0 && moveAllowed)
                     {
                         _SelectionNr--;
-                        if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -376,10 +373,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     if (moveAllowed)
                     {
                         _SelectionNr++;
-                        if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -396,10 +390,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     else if (_SelectionNr >= 1 && moveAllowed)
                     {
                         _SelectionNr -= 1;
-                        if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -416,10 +407,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     else if (moveAllowed)
                     {
                         _SelectionNr += 1;
-                        if(CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -572,6 +560,14 @@ namespace VocaluxeLib.Menu.SongMenu
             _UpdateListIfRequired();
         }
 
+        private void _AutoplayPreviewIfEnabled()
+        {
+            if(CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
+            {
+                _PreviewNr = _SelectionNr;
+            }
+        }
+
         private void _NextCategory()
         {
             if (CBase.Songs.IsInCategory())
diff --git a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
index a331e0b1..56795c16 100644
--- a/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+++ b/VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
@@ -355,10 +355,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     if (_SelectionNr > 0 && moveAllowed)
                     {
                         _SelectionNr--;
-                        if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -367,10 +364,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     if (moveAllowed)
                     {
                         _SelectionNr++;
-                        if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -387,10 +381,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     else if (_SelectionNr >= _NumW && moveAllowed)
                     {
                         _SelectionNr -= _NumW;
-                        if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -407,10 +398,7 @@ namespace VocaluxeLib.Menu.SongMenu
                     else if (moveAllowed)
                     {
                         _SelectionNr += _NumW;
-                        if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
-                        {
-                            _PreviewNr = _SelectionNr;
-                        }
+                        _AutoplayPreviewIfEnabled();
                         keyEvent.Handled = true;
                     }
                     break;
@@ -535,6 +523,14 @@ namespace VocaluxeLib.Menu.SongMenu
             _UpdateListIfRequired();
         }
 
+        private void _AutoplayPreviewIfEnabled()
+        {
+            if (CBase.Config.GetAutoplayPreviews() == EOffOn.TR_CONFIG_ON)
+            {
+                _PreviewNr = _SelectionNr;
+            }
+        }
+
         private void _NextCategory()
         {
             if (CBase.Songs.IsInCategory())