aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/Kernel.cs
diff options
context:
space:
mode:
authorLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-15 16:27:07 -0400
committerLukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com>2012-07-15 16:27:07 -0400
commitbaedafbeb92db3ddf434f038984970bf0a6ac0c1 (patch)
tree92b167ae54d47feebba97e496825f8f271d86903 /MediaBrowser.Controller/Kernel.cs
parent2e03cb0916f69b324fe654f92f1642b21eb92005 (diff)
Switched to service stack json. Added more api enhancements.
Diffstat (limited to 'MediaBrowser.Controller/Kernel.cs')
-rw-r--r--MediaBrowser.Controller/Kernel.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs
index b99d84616..3db0cca8f 100644
--- a/MediaBrowser.Controller/Kernel.cs
+++ b/MediaBrowser.Controller/Kernel.cs
@@ -202,7 +202,7 @@ namespace MediaBrowser.Controller
return new Configuration();
}
- return JsonSerializer.Deserialize<Configuration>(file);
+ return JsonSerializer.DeserializeFromFile<Configuration>(file);
}
public void ReloadItem(BaseItem item)