Merge pull request #2516 from MediaBrowser/beta

Beta

1 files changed, 3 insertions, 4 deletions

diff --git a/Emby.Server.Implementations/Devices/DeviceManager.cs b/Emby.Server.Implementations/Devices/DeviceManager.cs
index 88c0ea203..588b42a09 100644
--- a/Emby.Server.Implementations/Devices/DeviceManager.cs
+++ b/Emby.Server.Implementations/Devices/DeviceManager.cs
@@ -195,13 +195,12 @@ namespace Emby.Server.Implementations.Devices
             }
 
             var config = _config.GetUploadOptions();
-            if (!string.IsNullOrWhiteSpace(config.CameraUploadPath))
+            var path = config.CameraUploadPath;
+            if (string.IsNullOrWhiteSpace(path))
             {
-                return config.CameraUploadPath;
+                path = DefaultCameraUploadsPath;
             }
 
-            var path = DefaultCameraUploadsPath;
-
             if (config.EnableCameraUploadSubfolders)
             {
                 path = Path.Combine(path, _fileSystem.GetValidFilename(device.Name));