Fixed #229

ST-Apps · Aug 4, 2016 · c80313b · c80313b
1 parent a3f8d5f
commit c80313b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 14 deletions.
diff --git a/.vs/Pokemon Go Universal/v14/.suo b/.vs/Pokemon Go Universal/v14/.suo
diff --git a/PokemonGo-UWP/Utils/GameClient.cs b/PokemonGo-UWP/Utils/GameClient.cs
@@ -266,27 +266,32 @@ public static async Task InitializeDataUpdate()
             };
             _mapUpdateTimer.Tick += async (s, e) =>
             {
-                if (!UpdateDataMutex.WaitOne(0)) return;
-                if (_skipNextUpdate)
-                {
-                    _skipNextUpdate = false;
-                }
-                else
-                {
-                    Logger.Write("Updating map");
-                    await UpdateMapObjects();
-                }
-
-                UpdateDataMutex.ReleaseMutex();
-            };
+                Logger.Write("Updating map");
+                await UpdateMapObjects();
+            };            
             // Update before starting timer            
             Busy.SetBusy(true, Resources.Translation.GetString("GettingUserData"));
             await UpdateMapObjects();
             await UpdateInventory();
-            _mapUpdateTimer.Start();
             Busy.SetBusy(false);
         }
 
+        /// <summary>
+        /// Toggles the update timer based on the isEnabled value
+        /// </summary>
+        /// <param name="isEnabled"></param>
+        public static void ToggleUpdateTimer(bool isEnabled = true)
+        {
+            if (isEnabled)
+            {      
+                _mapUpdateTimer.Start();          
+            }
+            else
+            {
+                _mapUpdateTimer.Stop();
+            }
+        }
+
         /// <summary>
         /// Updates catcheable and nearby Pokemons + Pokestops.
         /// We're using a single method so that we don't need two separate calls to the server, making things faster.

diff --git a/PokemonGo-UWP/ViewModels/GameMapPageViewModel.cs b/PokemonGo-UWP/ViewModels/GameMapPageViewModel.cs
@@ -64,6 +64,8 @@ await Dispatcher.DispatchAsync(async () =>
                     }
                 });
             }
+            // Restarts map timer
+            GameClient.ToggleUpdateTimer();
             if (suspensionState.Any())
             {
                 // Recovering the state                
@@ -111,6 +113,8 @@ public override async Task OnNavigatedFromAsync(IDictionary<string, object> susp
         public override async Task OnNavigatingFromAsync(NavigatingEventArgs args)
         {
             args.Cancel = false;
+            // Stops map timer
+            GameClient.ToggleUpdateTimer(false);
             GameClient.MapPokemonUpdated -= GameClientOnMapPokemonUpdated;
             await Task.CompletedTask;
         }