diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-07-22 12:30:23 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-07-22 12:30:23 +0300 |
| commit | 93bf6344f8cc37a662c19db81c4f341e5b9ed0f0 (patch) | |
| tree | 97bdd9c49faa069110ccb1cd32635fcaabd29725 /Software/Visual_Studio/PPC | |
| parent | 66f8cf884fbd7f85976e96028c8047c0985a9d8f (diff) | |
| parent | 9aa38289b089d2518c5b0ef68e78f262fe4a31ee (diff) | |
| download | Tango-93bf6344f8cc37a662c19db81c4f341e5b9ed0f0.tar.gz Tango-93bf6344f8cc37a662c19db81c4f341e5b9ed0f0.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC')
3 files changed, 11 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index c2a48aec9..98480ebb9 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -8,4 +8,4 @@ using System.Windows; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.1.20.0")] +[assembly: AssemblyVersion("1.1.21.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs index e84fd81a1..3b45a0c2b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MainViewVM.cs @@ -35,6 +35,7 @@ namespace Tango.PPC.UI.ViewModels private bool _isPowerUpDialogShown; private bool _isThreadLoadingShown; private PowerUpAppBarItem _powerUpAppBar; + private bool _started; private DateTime _currentDateTime; /// <summary> @@ -79,6 +80,7 @@ namespace Tango.PPC.UI.ViewModels private void MachineOperator_PowerUpEnded(object sender, EventArgs e) { + _started = false; _powerUpAppBar?.Close(); _powerUpAppBar = null; } @@ -93,6 +95,8 @@ namespace Tango.PPC.UI.ViewModels private void MachineOperator_PowerUpStarted(object sender, PMR.Power.StartPowerUpResponse e) { + _started = true; + InvokeUI(() => { if (_powerUpAppBar != null) @@ -100,8 +104,11 @@ namespace Tango.PPC.UI.ViewModels _powerUpAppBar.Close(); } - _powerUpAppBar = NotificationProvider.PushAppBarItem<PowerUpAppBarItem>(); - _powerUpAppBar.Priority = AppBarPriority.Low; + if (_started) + { + _powerUpAppBar = NotificationProvider.PushAppBarItem<PowerUpAppBarItem>(); + _powerUpAppBar.Priority = AppBarPriority.Low; + } }); } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> + <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> </requestedPrivileges> </security> </trustInfo> |