From 8ceb630bc207858e92dce58b9faadd5ff846fc9e Mon Sep 17 00:00:00 2001
From: Kenneth van Ewijk <kennyboy@live.nl>
Date: Thu, 21 Jan 2016 21:33:59 +0100
Subject: [PATCH] Actual fix random network sending + stopgame command

---
 YJMPD-UWP/Model/ApiHandler.cs   |  6 +++++-
 YJMPD-UWP/ViewModels/PhotoVM.cs | 16 ++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/YJMPD-UWP/Model/ApiHandler.cs b/YJMPD-UWP/Model/ApiHandler.cs
index d8c76c6..ac0eb7d 100644
--- a/YJMPD-UWP/Model/ApiHandler.cs
+++ b/YJMPD-UWP/Model/ApiHandler.cs
@@ -26,7 +26,8 @@ namespace YJMPD_UWP.Model
             PictureUrl,
             DestinationReached,
             GameEnded,
-            PlayerReady
+            PlayerReady,
+            StopGame
         }
 
         public ApiHandler()
@@ -94,6 +95,9 @@ namespace YJMPD_UWP.Model
 
                     App.Game.StopMatch();
                     break;
+                case Command.StopGame:
+                    App.Game.StopGame();
+                    break;
                 default:
                     //Do nothing
                     break;
diff --git a/YJMPD-UWP/ViewModels/PhotoVM.cs b/YJMPD-UWP/ViewModels/PhotoVM.cs
index 3608492..96c7f12 100644
--- a/YJMPD-UWP/ViewModels/PhotoVM.cs
+++ b/YJMPD-UWP/ViewModels/PhotoVM.cs
@@ -19,6 +19,22 @@ namespace YJMPD_UWP.ViewModels
             timer.Interval = TimeSpan.FromSeconds(1);
             timer.Tick += Timer_Tick;
             timer.Start();
+
+            App.Photo.OnStatusUpdate += Photo_OnStatusUpdate;
+        }
+
+        private void Photo_OnStatusUpdate(object sender, Helpers.EventArgs.PhotoStatusUpdatedEventArgs e)
+        {
+            dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+            {
+                if (e.Status == Model.PhotoHandler.PhotoStatus.NOPHOTO)
+                    timer.Start();
+                else
+                {
+                    secondsleft = 60;
+                    timer.Stop();
+                }
+            });
         }
 
         private void Timer_Tick(object sender, object e)