xibosignage · dasgarner · Jun 16, 2015 · Jun 16, 2015 · Jun 16, 2015 · Jun 16, 2015
diff --git a/Forms/About.resx b/Forms/About.resx
@@ -112,12 +112,12 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAKAAAABSCAYAAADTld8/AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH
@@ -165,7 +165,7 @@
         XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS
         fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+
         tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/
-        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALEAAACxABrSO9dQAAABp0RVh0U29mdHdhcmUA
+        6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAALDwAACw8BkvkDpQAAABp0RVh0U29mdHdhcmUA
         UGFpbnQuTkVUIHYzLjUuMTAw9HKhAAA+J0lEQVR4Xu2dd3hURffHg6B0COmh9xZKqNIJ6aQ3AgRCF0RU
         9EVRAZFeEtIhEFBREAVEUCkCAUIKHVSqWPAFFBR9/VlRrPd3Pjc7y93NBkgI6B/O83yf3bs7d+bMnO+c
         c6bcXbt/0z8ylTPhHkF5QQUT7jW85zuV7+9Kqn4lI/Ip/JPk/DfdYjIqFCVWElQT1BTYC2qZXqsLqggq
@@ -435,8 +435,8 @@
 </value>
   </data>
   <data name="richTextBox1.Text" xml:space="preserve">
-    <value>Xibo - Digitial Signage - http://www.xibo.org.uk
-Copyright (C) 2006-2014 Daniel Garner and the Xibo Developers
+    <value>Xibo - Digital Signage - http://www.xibo.org.uk
+Copyright (C) 2006-2015 Daniel Garner and the Xibo Developers
 
 Xibo is free software: you can redistribute it and/or modify
 it under the terms of the GNU Affero General Public License as published by

diff --git a/Logic/ApplicationSettings.cs b/Logic/ApplicationSettings.cs
@@ -37,9 +37,9 @@ public class ApplicationSettings
         private static string _default = "default";
 
         // Application Specific Settings we want to protect
-        private string _clientVersion = "1.7.3";
+        private string _clientVersion = "1.7.4";
         private string _version = "4";
-        private int _clientCodeVersion = 107;
+        private int _clientCodeVersion = 108;
 
         public string ClientVersion { get { return _clientVersion; } }
         public string Version { get { return _version; } }

diff --git a/MainForm.cs b/MainForm.cs
@@ -459,7 +459,7 @@ private void ChangeToNextLayout(string layoutPath)
                         using (xmds.xmds statusXmds = new xmds.xmds())
                         {
                             statusXmds.Url = ApplicationSettings.Default.XiboClient_xmds_xmds;
-                            statusXmds.NotifyStatusAsync(ApplicationSettings.Default.Version, ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, "{\"currentLayoutId\":" + _layoutId + "}");
+                            statusXmds.NotifyStatusAsync(ApplicationSettings.Default.ServerKey, ApplicationSettings.Default.HardwareKey, "{\"currentLayoutId\":" + _layoutId + "}");
                         }
                     }
                 }

diff --git a/Media/IeWebMedia.cs b/Media/IeWebMedia.cs
@@ -62,6 +62,9 @@ public IeWebMedia(RegionOptions options)
                 // Write to temporary file
                 ReadControlMeta();
 
+                // Start the timer (will be reset in DocumentComplete)
+                base.StartTimer();
+
                 // Navigate to temp file
                 _webBrowser.Navigate(_filePath);
             }
@@ -79,7 +82,7 @@ public IeWebMedia(RegionOptions options)
         void _webBrowser_DocumentCompleted(object sender, WebBrowserDocumentCompletedEventArgs e)
         {
             // Start the timer
-            base.StartTimer();
+            base.RestartTimer();
 
             if (_disposed)
                 return;
@@ -174,6 +177,10 @@ private void xmds_GetResourceCompleted(object sender, XiboClient.xmds.GetResourc
                     {
                         // Cached file to revert to
                         UpdateCacheIfNecessary();
+
+                        // Start the timer
+                        StartTimer();
+
                         _webBrowser.Navigate(_filePath);
                     }
                     else
@@ -213,6 +220,9 @@ private void xmds_GetResourceCompleted(object sender, XiboClient.xmds.GetResourc
                     // Read the control meta back out
                     ReadControlMeta();
 
+                    // Start the timer
+                    StartTimer();
+
                     // Handle Navigate in here because we will not have done it during first load
                     _webBrowser.Navigate(_filePath);
                 }

diff --git a/Media/Media.cs b/Media/Media.cs
@@ -187,6 +187,10 @@ protected void RestartTimer()
                 _timer.Stop();
                 _timer.Start();
             }
+            else
+            {
+                StartTimer();
+            }
         }
 
         /// <summary>

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Xibo Digital Signage")]
 [assembly: AssemblyProduct("Xibo")]
-[assembly: AssemblyCopyright("Copyright Dan Garner ©  2008-2014")]
+[assembly: AssemblyCopyright("Copyright Dan Garner ©  2008-2015")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/XiboClient.v11.suo b/XiboClient.v11.suo
diff --git a/bin/x86/Release/XiboClient.XmlSerializers.dll b/bin/x86/Release/XiboClient.XmlSerializers.dll
diff --git a/bin/x86/Release/XiboClient.exe b/bin/x86/Release/XiboClient.exe
diff --git a/bin/x86/Release/XiboClient.pdb b/bin/x86/Release/XiboClient.pdb