1.1 --- a/Server/MainForm.cs	Sat Jan 17 18:26:41 2015 +0100
     1.2 +++ b/Server/MainForm.cs	Sun Jan 18 12:35:22 2015 +0100
     1.3 @@ -57,6 +57,9 @@
     1.4          //Function pointer for pixel Y coordinate intercept
     1.5          CoordinateTranslationDelegate iScreenY;
     1.6  
     1.7 +		//
     1.8 +		private StartupManager iStartupManager;
     1.9 +
    1.10          public MainForm()
    1.11          {
    1.12              iCurrentClientSessionId = "";
    1.13 @@ -64,6 +67,7 @@
    1.14              LastTickTime = DateTime.Now;
    1.15              iDisplay = new Display();
    1.16              iClients = new Dictionary<string, ClientData>();
    1.17 +			iStartupManager = new StartupManager();
    1.18  
    1.19              InitializeComponent();
    1.20              UpdateStatus();
    1.21 @@ -89,6 +93,9 @@
    1.22              {
    1.23                  OpenDisplayConnection();
    1.24              }
    1.25 +
    1.26 +			//
    1.27 +			checkBoxAutoStart.Checked=iStartupManager.Startup;
    1.28          }
    1.29  
    1.30          /// <summary>
    1.31 @@ -1405,6 +1412,11 @@
    1.32  				}
    1.33              }
    1.34          }
    1.35 +
    1.36 +		private void checkBoxAutoStart_CheckedChanged(object sender, EventArgs e)
    1.37 +		{
    1.38 +			iStartupManager.Startup = checkBoxAutoStart.Checked;
    1.39 +		}
    1.40      }
    1.41  
    1.42      /// <summary>