Skip to content

Commit

Permalink
Hotfix/1.7.8 (#33)
Browse files Browse the repository at this point in the history
* Bump SCR

* Changes to exception handling and topmost setting.

* Misc tweaks around logging and unhandled exceptions:
 - Create larger log files when in audit mode
 - Send more log files each collection by default
 - Unset and reset TopMost when the client information window is shown
 - Attempt to restart on unhandled exception

* Implement Watchdog start
xibosignage/xibo#789
Also Standardise icons across forms.

* Safer copy/write/move on use app settings

* Build step for SCR. Watchdog quote args.

* Disable windows error reporting on start.

* Fix for mac address formatting
xibosignage/xibo#785

* Fix a race condition between the library and log agents.

* Fix watchdog/player start race condition that triggered activity check

* Better error messages for file locks and recovery for a lock event during layout load
xibosignage/xibo#796

* Fix for using pattern around File.Open
xibosignage/xibo#796

* Setting to prevent sleep
Bump versions.
xibosignage/xibo#794

* Fix issue with watchdog starting during screensaver (prevented sleeping).
  • Loading branch information
dasgarner committed Jun 6, 2016
1 parent f6c96e2 commit 3a0020d
Show file tree
Hide file tree
Showing 30 changed files with 314 additions and 2,554 deletions.
33 changes: 33 additions & 0 deletions Control/WatchDogManager.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Text;
using System.Windows.Forms;

namespace XiboClient.Control
{
class WatchDogManager
{
public static void Start()
{
// Check to see if the WatchDog EXE exists where we expect it to be
string path = Path.GetDirectoryName(Application.ExecutablePath) + @"\watchdog\x86\XiboClientWatchdog.exe";
string args = "-p \"" + Application.ExecutablePath + "\" -l \"" + ApplicationSettings.Default.LibraryPath + "\"";

// Start it
if (File.Exists(path))
{
try
{
Process.Start(path, args);
}
catch (Exception e)
{
Trace.WriteLine(new LogMessage("WatchDogManager - Start", "Unable to start: " + e.Message), LogType.Error.ToString());
}
}
}
}
}
1 change: 0 additions & 1 deletion Forms/About.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Forms/About.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public partial class About : Form
public About()
{
InitializeComponent();

Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath);
label1.Text = Application.ProductName;
label2.Text = ApplicationSettings.Default.ClientVersion;
}
Expand Down
606 changes: 0 additions & 606 deletions Forms/About.resx

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions Forms/OptionForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Forms/OptionForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public partial class OptionForm : Form
public OptionForm()
{
InitializeComponent();

Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath);
Debug.WriteLine("Initialise Option Form Components", "OptionForm");

// Get a hardware key here, just in case we havent been able to get one before
Expand Down
607 changes: 0 additions & 607 deletions Forms/OptionForm.resx

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions Log/ClientInfo.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Log/ClientInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public string CurrentLayoutId
public ClientInfo()
{
InitializeComponent();

Icon = Icon.ExtractAssociatedIcon(Application.ExecutablePath);
MaximizeBox = false;
MinimizeBox = false;

Expand Down
Loading

0 comments on commit 3a0020d

Please sign in to comment.