diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-13 17:06:24 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-13 17:06:24 -0400 |
| commit | 9728aa8b0abc7785f8c9f3d62c2adff1920cfab9 (patch) | |
| tree | 111975663193ef2dfab67380e6d5a2f4f9d554f6 /MediaBrowser.Api/Devices/DeviceService.cs | |
| parent | 17e8813378c2fe1a83d1eddb829dae68f8c71bfe (diff) | |
| parent | 9a0a4575adbba04b6b7f3294e70175a98b864a90 (diff) | |
Merge branch 'master' into register-services-correctly
Diffstat (limited to 'MediaBrowser.Api/Devices/DeviceService.cs')
| -rw-r--r-- | MediaBrowser.Api/Devices/DeviceService.cs | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/MediaBrowser.Api/Devices/DeviceService.cs b/MediaBrowser.Api/Devices/DeviceService.cs index 8b63decd2..7004a2559 100644 --- a/MediaBrowser.Api/Devices/DeviceService.cs +++ b/MediaBrowser.Api/Devices/DeviceService.cs @@ -155,16 +155,14 @@ namespace MediaBrowser.Api.Devices Id = id }); } - else + + return _deviceManager.AcceptCameraUpload(deviceId, request.RequestStream, new LocalFileInfo { - return _deviceManager.AcceptCameraUpload(deviceId, request.RequestStream, new LocalFileInfo - { - MimeType = Request.ContentType, - Album = album, - Name = name, - Id = id - }); - } + MimeType = Request.ContentType, + Album = album, + Name = name, + Id = id + }); } } } |