diff options
| author | Andrew Rabert <6550543+nvllsvm@users.noreply.github.com> | 2018-12-20 22:10:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 22:10:42 -0500 |
| commit | e163fea9d9fed9f19e81999a7de45f3157db5b3e (patch) | |
| tree | ca32a6ef76f6424ae5847ee2251ac37e90f35b68 /Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs | |
| parent | a8bce31a01225911b69f2c3b59a7397895f7b79b (diff) | |
| parent | b4bd4e3584fafe559345e47feb6f8e1d8c1ed699 (diff) | |
Merge pull request #248 from jellyfin/develop
Master 3.5.2-4
Diffstat (limited to 'Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs')
| -rw-r--r-- | Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs index 12669d05d..620d3bae9 100644 --- a/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs +++ b/Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs @@ -144,24 +144,17 @@ namespace IsoMounter return Task.FromResult(false); } - public async Task<IIsoMount> Mount(string isoPath, CancellationToken cancellationToken) + public Task<IIsoMount> Mount(string isoPath, CancellationToken cancellationToken) { - - LinuxMount mountedISO; - - if (MountISO(isoPath, out mountedISO)) { - - return mountedISO; - - }else{ - + if (MountISO(isoPath, out LinuxMount mountedISO)) { + return Task.FromResult<IIsoMount>(mountedISO); + } + else { throw new IOException(String.Format( "An error occurred trying to mount image [$0].", isoPath )); - } - } #endregion |
