Fixed: Movies not getting unmonitored when folder gets deleted.

Fixes #1191, Fixes #1590

src/NzbDrone.Core/MediaFiles/DiskScanService.cs

@@ -161,15 +161,9 @@ namespace NzbDrone.Core.MediaFiles
 
             if (!_diskProvider.FolderExists(movie.Path))
             {
-                if (_configService.CreateEmptySeriesFolders &&
-                    _diskProvider.FolderExists(rootFolder))
-                {
-                    _logger.Debug("Creating missing movies folder: {0}", movie.Path);
-                    _diskProvider.CreateFolder(movie.Path);
-                    SetPermissions(movie.Path);
-                }
-                else
+                if (movie.MovieFileId != 0)
                 {
+                    //Since there is no folder, there can't be any files right?
                     // Delete Movie from MovieFiles
                     _movieFileRepository.Delete(movie.MovieFileId);
 
@@ -179,6 +173,13 @@ namespace NzbDrone.Core.MediaFiles
 
                     _logger.Debug("Movies folder doesn't exist: {0}", movie.Path);
                 }
+                else if (_configService.CreateEmptySeriesFolders &&
+                    _diskProvider.FolderExists(rootFolder))
+                {
+                    _logger.Debug("Creating missing movies folder: {0}", movie.Path);
+                    _diskProvider.CreateFolder(movie.Path);
+                    SetPermissions(movie.Path);
+                }
 
                 _eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.MovieFolderDoesNotExist));
                 return;