From: Stricted Date: Tue, 12 Jan 2016 22:42:35 +0000 (+0100) Subject: fix ltepopup X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6f3a97a4603bd1ad247298fd37f9fcafcfddabee;p=GitHub%2FStricted%2FSpeedportHybridControl.git fix ltepopup --- diff --git a/SpeedportHybridControl/PageModel/AboutPageModel.cs b/SpeedportHybridControl/PageModel/AboutPageModel.cs index 0346e25..93541d6 100644 --- a/SpeedportHybridControl/PageModel/AboutPageModel.cs +++ b/SpeedportHybridControl/PageModel/AboutPageModel.cs @@ -7,28 +7,29 @@ using System.Windows; namespace SpeedportHybridControl.PageModel { class AboutPageModel : SuperViewModel { - private string _version; private DelegateCommand _donateCommand; private DelegateCommand _bugtrackerCommand; private DelegateCommand _updateCommand; public string version { - get { return _version; } - set { SetProperty(ref _version, value); } + get { return MainWindowModel.VERSION; } } - public DelegateCommand DonateCommand { + public DelegateCommand DonateCommand + { get { return _donateCommand; } set { SetProperty(ref _donateCommand, value); } } - public DelegateCommand BugtrackerCommand { + public DelegateCommand BugtrackerCommand + { get { return _bugtrackerCommand; } set { SetProperty(ref _bugtrackerCommand, value); } } - public DelegateCommand UpdateCommand { + public DelegateCommand UpdateCommand + { get { return _updateCommand; } set { SetProperty(ref _updateCommand, value); } } @@ -54,8 +55,6 @@ namespace SpeedportHybridControl.PageModel { DonateCommand = new DelegateCommand(new Action(OnDonateCommandExecute)); BugtrackerCommand = new DelegateCommand(new Action(OnBugtrackerCommandExecute)); UpdateCommand = new DelegateCommand(new Action(OnUpdateCommandExecute)); - - version = MainWindowModel.VERSION; } } } diff --git a/SpeedportHybridControl/PageModel/LteInfoModel.cs b/SpeedportHybridControl/PageModel/LteInfoModel.cs index 64b05ba..4a8a8a5 100644 --- a/SpeedportHybridControl/PageModel/LteInfoModel.cs +++ b/SpeedportHybridControl/PageModel/LteInfoModel.cs @@ -92,10 +92,10 @@ namespace SpeedportHybridControl.PageModel { if (_ltepopup.Visibility.Equals(Visibility.Visible).Equals(false)) { _ltepopup.Show(); StopTimer(); - } - ltepopupModel lm = Application.Current.FindResource("ltepopupModel") as ltepopupModel; - lm.StartTimer(); + ltepopupModel lm = Application.Current.FindResource("ltepopupModel") as ltepopupModel; + lm.StartTimer(); + } } public bool AutoReload {