aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBond_009 <Bond.009@outlook.com>2019-03-29 20:34:42 +0100
committerBond_009 <Bond.009@outlook.com>2019-03-29 20:34:42 +0100
commitf911fda34fdc1af76dc475c5af042ff6b44262ab (patch)
tree39ddf0ad8a55582ff1efb71361558675fa17185c
parent41df562419d8f1681a9720ab1c62ffb9ad0f96cb (diff)
Merge ifs
-rw-r--r--Emby.Server.Implementations/IO/ManagedFileSystem.cs9
1 files changed, 3 insertions, 6 deletions
diff --git a/Emby.Server.Implementations/IO/ManagedFileSystem.cs b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
index 4b5cfe3b9..0dea5041a 100644
--- a/Emby.Server.Implementations/IO/ManagedFileSystem.cs
+++ b/Emby.Server.Implementations/IO/ManagedFileSystem.cs
@@ -78,16 +78,13 @@ namespace Emby.Server.Implementations.IO
public virtual string MakeAbsolutePath(string folderPath, string filePath)
{
- if (string.IsNullOrWhiteSpace(filePath))
+ if (string.IsNullOrWhiteSpace(filePath)
+ // stream
+ || filePath.Contains("://"))
{
return filePath;
}
- if (filePath.Contains("://"))
- {
- return filePath; // stream
- }
-
if (filePath.Length > 3 && filePath[1] == ':' && filePath[2] == '/')
{
return filePath; // absolute local path