diff --git a/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs b/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs index 7c362a9199..441e46f41c 100644 --- a/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs +++ b/MediaBrowser.Server.Implementations/IO/DirectoryWatchers.cs @@ -369,7 +369,7 @@ namespace MediaBrowser.Server.Implementations.IO lock (_timerLock) { // Extend the timer as long as any of the paths are still being written to. - if (_affectedPaths.Any(p => !FileSystem.GetFileSystemInfo(p.Key).Attributes.HasFlag(FileAttributes.ReadOnly) && IsFileLocked(p.Key))) + if (_affectedPaths.Any(p => IsFileLocked(p.Key))) { Logger.Info("Timer extended."); _updateTimer.Change(TimeSpan.FromSeconds(ConfigurationManager.Configuration.FileWatcherDelay), TimeSpan.FromMilliseconds(-1)); @@ -400,7 +400,9 @@ namespace MediaBrowser.Server.Implementations.IO { var data = FileSystem.GetFileSystemInfo(path); - if (!data.Exists || data.Attributes.HasFlag(FileAttributes.Directory)) + if (!data.Exists + || data.Attributes.HasFlag(FileAttributes.Directory) + || data.Attributes.HasFlag(FileAttributes.ReadOnly)) { return false; } diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs index 9a1065db52..393002a6ee 100644 --- a/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs +++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Audio/MusicAlbumDiscResolver.cs @@ -15,7 +15,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Audio /// The priority. public override ResolverPriority Priority { - get { return ResolverPriority.Third; } // we need to be ahead of the generic folder resolver but behind the movie one + get { return ResolverPriority.Second; } // we need to be ahead of the generic folder resolver but behind the movie one } ///