Improved the worker thread to prevent crashes of the worker on Windows.v2.0.0.56-2.0_preview_2014-08-11

1 files changed, 4 insertions, 3 deletions

diff --git a/Duplicati/Server/Program.cs b/Duplicati/Server/Program.cs
index f55bd7cbb..067d1da13 100644
--- a/Duplicati/Server/Program.cs
+++ b/Duplicati/Server/Program.cs
@@ -408,10 +408,11 @@ namespace Duplicati.Server
                 }, LiveControl.State == LiveControls.LiveControlState.Paused);

                 Program.Scheduler = new Scheduler(WorkThread);

 

-                Program.WorkThread.StartingWork += new EventHandler(SignalNewEvent);

-                Program.WorkThread.CompletedWork += new EventHandler(SignalNewEvent);

-                Program.WorkThread.WorkQueueChanged += new EventHandler(SignalNewEvent);

+                Program.WorkThread.StartingWork += (worker, task) => { SignalNewEvent(null, null); };

+                Program.WorkThread.CompletedWork += (worker, task) => { SignalNewEvent(null, null); };

+                Program.WorkThread.WorkQueueChanged += (worker) => { SignalNewEvent(null, null); };

                 Program.Scheduler.NewSchedule += new EventHandler(SignalNewEvent);

+                Program.WorkThread.OnError += (worker, task, exception) => { Program.DataConnection.LogError(task == null ? null : task.BackupID, "Error in worker", exception); };

 

                 Program.WebServer = new WebServer.Server(commandlineOptions);