From 48414d4dc5356af7aed7b97d4e09ca74a4c4e273 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Sun, 15 Feb 2015 21:51:48 +0100 Subject: [PATCH] Fixed the crash mentioned in #1295. --- Duplicati/Server/WebServer/ControlHandler.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Duplicati/Server/WebServer/ControlHandler.cs b/Duplicati/Server/WebServer/ControlHandler.cs index 219903727..5624c4e9a 100644 --- a/Duplicati/Server/WebServer/ControlHandler.cs +++ b/Duplicati/Server/WebServer/ControlHandler.cs @@ -944,7 +944,10 @@ namespace Duplicati.Server.WebServer var o = new Newtonsoft.Json.Linq.JObject(); // Add application wide settings - o.Add("ApplicationOptions", new Newtonsoft.Json.Linq.JArray(Program.DataConnection.Settings)); + o.Add("ApplicationOptions", new Newtonsoft.Json.Linq.JArray( + from n in Program.DataConnection.Settings + select Newtonsoft.Json.Linq.JObject.FromObject(n) + )); try {