1.1 --- a/Server/MainForm.cs	Sun Jan 18 18:32:32 2015 +0100
     1.2 +++ b/Server/MainForm.cs	Sun Jan 18 19:01:29 2015 +0100
     1.3 @@ -38,7 +38,6 @@
     1.4      /// </summary>
     1.5      public partial class MainForm : Form
     1.6      {
     1.7 -
     1.8          DateTime LastTickTime;
     1.9          Display iDisplay;
    1.10          System.Drawing.Bitmap iBmp;
    1.11 @@ -114,10 +113,6 @@
    1.12                  OpenDisplayConnection();
    1.13              }
    1.14  
    1.15 -			//Check if "run on Windows startup" is enabled
    1.16 -			checkBoxAutoStart.Checked=iStartupManager.Startup;
    1.17 -
    1.18 -
    1.19  			//Setup notification icon
    1.20  			SetupTrayIcon();
    1.21  
    1.22 @@ -126,6 +121,13 @@
    1.23  			{
    1.24  				Visible = false;
    1.25  			}
    1.26 +
    1.27 +#if !DEBUG
    1.28 +			//When not debugging we want the screen to be empty until a client takes over 
    1.29 +			tableLayoutPanel.Controls.Clear();
    1.30 +			tableLayoutPanel.RowStyles.Clear();
    1.31 +			tableLayoutPanel.ColumnStyles.Clear();
    1.32 +#endif
    1.33          }
    1.34  
    1.35  		/// <summary>
    1.36 @@ -615,6 +617,9 @@
    1.37              }
    1.38  
    1.39              CheckFontHeight();
    1.40 +			//Check if "run on Windows startup" is enabled
    1.41 +			checkBoxAutoStart.Checked = iStartupManager.Startup;
    1.42 +			//
    1.43              checkBoxConnectOnStartup.Checked = Properties.Settings.Default.DisplayConnectOnStartup;
    1.44  			checkBoxMinimizeToTray.Checked = Properties.Settings.Default.MinimizeToTray;
    1.45  			checkBoxStartMinimized.Checked = Properties.Settings.Default.StartMinimized;