Merge pull request #36 from dasgarner/develop

Build 1.8.0-beta
xibosignage · Jun 29, 2016 · 9db4ef0 · 9db4ef0
2 parents 2dbb62a + 9212bdd
commit 9db4ef0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/Logic/ApplicationSettings.cs b/Logic/ApplicationSettings.cs
@@ -39,9 +39,9 @@ public class ApplicationSettings
         private static string _default = "default";
 
         // Application Specific Settings we want to protect
-        private string _clientVersion = "1.8.0-alpha3";
+        private string _clientVersion = "1.8.0-beta";
         private string _version = "5";
-        private int _clientCodeVersion = 121;
+        private int _clientCodeVersion = 122;
 
         public string ClientVersion { get { return _clientVersion; } }
         public string Version { get { return _version; } }

diff --git a/MainForm.cs b/MainForm.cs
@@ -284,13 +284,15 @@ void Instance_KeyPress(string name)
                 {
                     _clientInfoForm.Hide();
 #if !DEBUG
-                    TopMost = true;
+                    if (!_screenSaver)
+                        TopMost = true;
 #endif
                 }
                 else
                 {
 #if !DEBUG
-                    TopMost = false;
+                    if (!_screenSaver)
+                        TopMost = false;
 #endif
                     _clientInfoForm.Show();
                     _clientInfoForm.BringToFront();
@@ -329,6 +331,12 @@ void MainForm_Shown(object sender, EventArgs e)
 
                 // Initialize the other schedule components
                 _schedule.InitializeComponents();
+
+                // Set this form to topmost
+#if !DEBUG
+                if (!_screenSaver)
+                    TopMost = true;
+#endif
             }
             catch (Exception ex)
             {
@@ -361,12 +369,6 @@ private void MainForm_Load(object sender, EventArgs e)
             // Change the default Proxy class
             OptionForm.SetGlobalProxy();
 
-            // Set this form to topmost
-#if !DEBUG
-            if (!_screenSaver)
-                TopMost = true;
-#endif
-
             // UserApp data
             Debug.WriteLine(new LogMessage("MainForm_Load", "User AppData Path: " + ApplicationSettings.Default.LibraryPath), LogType.Info.ToString());
         }

diff --git a/XmdsAgents/RegisterAgent.cs b/XmdsAgents/RegisterAgent.cs
@@ -225,7 +225,7 @@ public static string ProcessRegisterXml(string xml)
                             catch
                             {
                                 error = true;
-                                message += "Invalid Configuration Option from CMS [" + node.Name + "]" + Environment.NewLine;
+                                message += "CMS sent configuration for [" + node.Name + "] which this player doesn't understand." + Environment.NewLine;
                             }
                         }
                     }
@@ -239,8 +239,8 @@ public static string ProcessRegisterXml(string xml)
                     message += result.DocumentElement.Attributes["message"].Value;
                 }
 
-                if (string.IsNullOrEmpty(message))
-                    message = result.DocumentElement.Attributes["message"].Value;
+                // Append the informational message with the message attribute.
+                message = result.DocumentElement.Attributes["message"].Value + Environment.NewLine + message;
             }
             catch (Exception ex)
             {

diff --git a/bin/x86/Release/Xibo.scr b/bin/x86/Release/Xibo.scr