[Mp-plugins-svn] SF.net SVN: mp-plugins:[3973] trunk/plugins/IR Server Suite/IR Server Suite /IR Server

[<che...@us...>]

Revision: 3973
          http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=3973&view=rev
Author:   chef_koch
Date:     2010-11-24 12:13:42 +0000 (Wed, 24 Nov 2010)

Log Message:
-----------
added separate setting for monitoring in tray

Modified Paths:
--------------
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs
    trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs	2010-11-24 09:32:55 UTC (rev 3972)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IR Server Tray/Program.cs	2010-11-24 12:13:42 UTC (rev 3973)
@@ -72,7 +72,7 @@
       _notifyIcon.Visible = true;
 
       Settings.LoadSettings();
-      if (Settings.RestartOnUSBChanges)
+      if (Settings.RestartOnUSBChangesTray)
       {
         _hardwareMonitor = new HardwareMonitor();
         _hardwareMonitor.DeviceConnected += new HardwareMonitor.HardwareMonitorEvent(OnDeviceConnected);
@@ -86,8 +86,11 @@
       Application.Run();
       thread.Abort();
 
-      _hardwareMonitor.Stop();
-      _hardwareMonitor = null;
+      if (Settings.RestartOnUSBChangesTray)
+      {
+        _hardwareMonitor.Stop();
+        _hardwareMonitor = null;
+      }
 
       _notifyIcon.Visible = false;
       _notifyIcon = null;

Modified: trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs
===================================================================
--- trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs	2010-11-24 09:32:55 UTC (rev 3972)
+++ trunk/plugins/IR Server Suite/IR Server Suite/IR Server/IRServer.Shared/Settings.cs	2010-11-24 12:13:42 UTC (rev 3973)
@@ -20,9 +20,10 @@
     public static IRServerMode Mode { get; set; }
     public static string HostComputer { get; set; }
     public static string ProcessPriority { get; set; }
-    public static bool RestartOnUSBChanges { get; set; }
     public static string[] PluginNameReceive { get; set; }
     public static string PluginNameTransmit { get; set; }
+    public static bool RestartOnUSBChanges { get; set; }
+    public static bool RestartOnUSBChangesTray { get; set; }
 
     /// <summary>
     /// Loads settings from XML-File to <see cref="Settings"/> class.
@@ -35,10 +36,12 @@
       Mode = IRServerMode.ServerMode;
       HostComputer = String.Empty;
       ProcessPriority = "No Change";
-      RestartOnUSBChanges = false;
       PluginNameReceive = null;
       PluginNameTransmit = String.Empty;
 
+      RestartOnUSBChanges = false;
+      RestartOnUSBChangesTray = false;
+
       XmlDocument doc = new XmlDocument();
 
       try
@@ -116,6 +119,15 @@
 
       try
       {
+        RestartOnUSBChangesTray = bool.Parse(doc.DocumentElement.Attributes["RestartOnUSBChangesTray"].Value);
+      }
+      catch (Exception ex)
+      {
+        IrssLog.Warn(ex.ToString());
+      }
+
+      try
+      {
         PluginNameTransmit = doc.DocumentElement.Attributes["PluginTransmit"].Value;
       }
       catch (Exception ex)
@@ -157,6 +169,7 @@
           writer.WriteAttributeString("HostComputer", HostComputer);
           writer.WriteAttributeString("ProcessPriority", ProcessPriority);
           writer.WriteAttributeString("RestartOnUSBChanges", RestartOnUSBChanges.ToString());
+          writer.WriteAttributeString("RestartOnUSBChangesTray", RestartOnUSBChangesTray.ToString());
           writer.WriteAttributeString("PluginTransmit", PluginNameTransmit);
 
           if (PluginNameReceive != null)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.