diff options
| author | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-26 11:44:42 -0400 |
|---|---|---|
| committer | Mark Monteiro <marknr.monteiro@protonmail.com> | 2020-04-26 11:44:42 -0400 |
| commit | 93649ad77b1e6b005a9b7a33d4c82bbce6189ecc (patch) | |
| tree | 225dc540a6166ed8ae13a4159cb1811a6c600f3c /MediaBrowser.Api/Devices/DeviceService.cs | |
| parent | 00a0e013c695a3741218985afadd31265a6ddb40 (diff) | |
| parent | f81833693d0cae476d923f704451bb794a78da8a (diff) | |
Merge remote-tracking branch 'upstream/master' into simplify-https-config
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 + }); } } } |