From 417462adb19c4489999087d8bb96e91ffeae3e65 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Fri, 13 Dec 2019 02:16:32 +0200
Subject: Quick fix.

---
 Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'Software/Visual_Studio')

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
index 0215e2456..c0ef85bcc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/PowerUpViewVM.cs
@@ -97,8 +97,6 @@ namespace Tango.PPC.UI.Dialogs
 
             if (RemainingSeconds == 0)
             {
-                _timer.Stop();
-
                 InvokeUI(() =>
                 {
                     Accept();
@@ -108,9 +106,16 @@ namespace Tango.PPC.UI.Dialogs
 
         protected override void Cancel()
         {
+            _timer.Stop();
             base.Cancel();
         }
 
+        protected override void Accept()
+        {
+            _timer.Stop();
+            base.Accept();
+        }
+
         public override void OnShow()
         {
             base.OnShow();
-- 
cgit v1.3.1