fixed song request bug

after the last song from the queue had been played, the song would not refresh
mart910322 · Mar 29, 2020 · a6b8a92 · a6b8a92
1 parent 0a060eb
commit a6b8a92
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/Songify Slim/MainWindow.xaml.cs b/Songify Slim/MainWindow.xaml.cs
@@ -21,16 +21,6 @@
 
 namespace Songify_Slim
 {
-    public class RequestObject
-    {
-        public string TrackID { get; set; }
-        public string Artists { get; set; }
-        public string Title { get; set; }
-        public string Length { get; set; }
-        public string Requester { get; set; }
-
-    }
-
     public partial class MainWindow
     {
         #region Variables
@@ -714,7 +704,10 @@ private void WriteSong(string artist, string title, string extra, string cover =
                     {
                         int start = CurrSong.IndexOf("{{");
                         int end = CurrSong.LastIndexOf("}}") + 2;
-                        CurrSong = CurrSong.Remove(start, end - start);
+                        if (start >= 0)
+                        {
+                            CurrSong = CurrSong.Remove(start, end - start);
+                        }
                     }
                 }
                 else

diff --git a/Songify Slim/Models/RequestModel.cs b/Songify Slim/Models/RequestModel.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Songify_Slim.Models
+{
+    public class RequestObject
+    {
+        public string TrackID { get; set; }
+        public string Artists { get; set; }
+        public string Title { get; set; }
+        public string Length { get; set; }
+        public string Requester { get; set; }
+
+    }
+}
diff --git a/Songify Slim/Songify Slim.csproj b/Songify Slim/Songify Slim.csproj
@@ -282,6 +282,7 @@
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="Models\PlayerType.cs" />
+    <Compile Include="Models\RequestModel.cs" />
     <Compile Include="Models\TrackInfo.cs" />
     <Compile Include="Util\Songify\Apihandler.cs" />
     <Compile Include="Util\Settings\ConfigHandler.cs" />

diff --git a/Songify Slim/Util/Songify/TwitchHandler.cs b/Songify Slim/Util/Songify/TwitchHandler.cs
@@ -12,6 +12,7 @@
 using TwitchLib.Communication.Clients;
 using TwitchLib.Communication.Models;
 using System.Linq;
+using Songify_Slim.Models;
 
 namespace Songify_Slim
 {

diff --git a/Songify Slim/Window_Queue.xaml.cs b/Songify Slim/Window_Queue.xaml.cs
@@ -1,16 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Songify_Slim.Models;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 
 namespace Songify_Slim
 {