Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta

This commit is contained in:
Luke Pulverenti 2016-07-03 20:19:30 -04:00
commit bb90157b07
2 changed files with 3 additions and 3 deletions

View File

@ -192,7 +192,7 @@ namespace MediaBrowser.Model.Configuration
public int MigrationVersion { get; set; }
public int SchemaVersion { get; set; }
public int SqliteCacheSizeKb { get; set; }
public int SqliteCacheSize { get; set; }
public bool DownloadImagesInAdvance { get; set; }
@ -212,7 +212,7 @@ namespace MediaBrowser.Model.Configuration
{
LocalNetworkAddresses = new string[] { };
Migrations = new string[] { };
SqliteCacheSizeKb = 50000;
SqliteCacheSize = 0;
EnableCustomPathSubFolders = true;
EnableLocalizedGuids = true;

View File

@ -123,7 +123,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
protected override async Task<IDbConnection> CreateConnection(bool isReadOnly = false)
{
var cacheSize = _config.Configuration.SqliteCacheSizeKb;
var cacheSize = _config.Configuration.SqliteCacheSize;
if (cacheSize <= 0)
{
cacheSize = Math.Min(Environment.ProcessorCount * 50000, 200000);