aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-03 20:19:30 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-07-03 20:19:30 -0400
commitbb90157b0723395b0e3cda20d04c42ff2970a07b (patch)
treee90a28ea23dbfffc4d2e8b10daffcec03354dc5d
parentb73e733a7066922c36cdb30966955f7a17fe2e5f (diff)
parentebc37b8d37fc26f97a6fe2d423fd97a0486cafe9 (diff)
Merge branch 'beta' of https://github.com/MediaBrowser/Emby into beta
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs4
-rw-r--r--MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 6031ae88e..081c46f0a 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -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;
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index d1b23a0ae..5b492c240 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -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);