diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-20 08:55:29 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-02-20 08:55:29 +0200 |
| commit | a23cfede23d891712d2a2b840373075968f08994 (patch) | |
| tree | 3ca77277ffaf20f4a4332b2321e913553bf1e300 /Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication | |
| parent | 38009a30108ff250ac4884bf85a89014db27b3bd (diff) | |
| parent | b740f2922a16a3df2897a4acbfca94bb87685045 (diff) | |
| download | Tango-a23cfede23d891712d2a2b840373075968f08994.tar.gz Tango-a23cfede23d891712d2a2b840373075968f08994.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication')
| -rw-r--r-- | Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs index 43b0cc047..4b5874907 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs @@ -161,11 +161,13 @@ namespace Tango.PPC.UI.PPCApplication //Start watchdog _watchdogServer = new WatchDogServer(Application.Current.Dispatcher); - +#if RELEASE + if (settings.EnableWatchDog) { _watchdogServer.Start(); } +#endif LogManager.Log("Reading Core settings..."); var coreSettings = SettingsManager.Default.GetOrCreate<CoreSettings>(); |