From 8b49afb0f3f2713391fc8204a5291c8d49685fa3 Mon Sep 17 00:00:00 2001
From: Don Archer <drasticp@gmail.com>
Date: Thu, 4 Aug 2016 19:58:51 -0700
Subject: [PATCH] add to queue working properly

---
 FirebaseKaraoke/FirebaseController.cs  |  3 ++-
 FirebaseKaraoke/FirebaseKaraoke.csproj |  5 +++--
 FirebaseKaraoke/app.config             | 11 +++++++++++
 FirebaseKaraoke/packages.config        |  2 +-
 KaraokePlayer/App.config               |  8 ++++----
 KaraokePlayer/KaraokePlayer.csproj     |  4 ++--
 KaraokePlayer/packages.config          |  2 +-
 7 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 FirebaseKaraoke/app.config

diff --git a/FirebaseKaraoke/FirebaseController.cs b/FirebaseKaraoke/FirebaseController.cs
index f5b3c5b..03a2656 100644
--- a/FirebaseKaraoke/FirebaseController.cs
+++ b/FirebaseKaraoke/FirebaseController.cs
@@ -168,7 +168,8 @@ namespace KaraokePlayer.Classes
         {
             var response = _client.Get(CurrentSongPath);
             var item = response.ResultAs<QueueItem>();
-            if (item != null)
+            if (item == null) return; 
+            if (CurrentSong == null || CurrentSong.Path != item.Song.Path)
             {
                 CurrentSong = item.Song;
                 _songChanged(new ControllerSongChangedEventArgs(item.Song));
diff --git a/FirebaseKaraoke/FirebaseKaraoke.csproj b/FirebaseKaraoke/FirebaseKaraoke.csproj
index 17aca06..e1996b2 100644
--- a/FirebaseKaraoke/FirebaseKaraoke.csproj
+++ b/FirebaseKaraoke/FirebaseKaraoke.csproj
@@ -46,8 +46,8 @@
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -76,6 +76,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/FirebaseKaraoke/app.config b/FirebaseKaraoke/app.config
new file mode 100644
index 0000000..8460dd4
--- /dev/null
+++ b/FirebaseKaraoke/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/FirebaseKaraoke/packages.config b/FirebaseKaraoke/packages.config
index 45a2770..84a4b1d 100644
--- a/FirebaseKaraoke/packages.config
+++ b/FirebaseKaraoke/packages.config
@@ -5,5 +5,5 @@
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net452" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net452" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/KaraokePlayer/App.config b/KaraokePlayer/App.config
index e89053c..4fc68df 100644
--- a/KaraokePlayer/App.config
+++ b/KaraokePlayer/App.config
@@ -6,9 +6,9 @@
   <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
   </configSections>
   <appSettings>
-    <add key="Firebase.Secret" value="9BQHUEJhScgK2FP10hvlToxTlGQpXT94Cvx01piO"/>
-    <add key="Firebase.Path" value="https://herse.firebaseio.com/"/>
-    <add key="KaraokePlayer.ControllerId" value="archer1"/>
+    <add key="Firebase.Secret" value="9BQHUEJhScgK2FP10hvlToxTlGQpXT94Cvx01piO" />
+    <add key="Firebase.Path" value="https://herse.firebaseio.com/" />
+    <add key="KaraokePlayer.ControllerId" value="archer1" />
   </appSettings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
@@ -27,7 +27,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/KaraokePlayer/KaraokePlayer.csproj b/KaraokePlayer/KaraokePlayer.csproj
index bc5670f..a9c6bba 100644
--- a/KaraokePlayer/KaraokePlayer.csproj
+++ b/KaraokePlayer/KaraokePlayer.csproj
@@ -73,8 +73,8 @@
       <HintPath>..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/KaraokePlayer/packages.config b/KaraokePlayer/packages.config
index c63e4c1..e0afe2b 100644
--- a/KaraokePlayer/packages.config
+++ b/KaraokePlayer/packages.config
@@ -6,5 +6,5 @@
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net46" />
   <package id="Microsoft.Bcl.Compression" version="3.9.85" targetFramework="net46" />
   <package id="Microsoft.Net.Http" version="2.2.29" targetFramework="net46" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net46" />
 </packages>
\ No newline at end of file