integrate development from v1

1 files changed, 7 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 78a310f0b..dbeef9ab2 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -158,6 +158,13 @@ namespace MediaBrowser.Model.Configuration
         public int MaxAudiobookResume { get; set; } = 5;
 
         /// <summary>
+        /// Gets or sets the threshold in minutes after a inactive session gets closed automatically.
+        /// If set to 0 the check for inactive sessions gets disabled.
+        /// </summary>
+        /// <value>The close inactive session threshold in minutes. 0 to disable.</value>
+        public int InactiveSessionThreshold { get; set; } = 10;
+
+        /// <summary>
         /// Gets or sets the delay in seconds that we will wait after a file system change to try and discover what has been added/removed
         /// Some delay is necessary with some items because their creation is not atomic.  It involves the creation of several
         /// different directories and files.