mirror of
https://github.com/tgstation/tgstation-server.git
synced 2026-08-27 07:04:57 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation-server into 885-SqliteSupport
This commit is contained in:
@@ -199,7 +199,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
|
||||
{
|
||||
IsDirectory = true,
|
||||
Path = ioManager.ConcatPath(configurationRelativePath, x),
|
||||
}));
|
||||
}).OrderBy(file => file.Path));
|
||||
}
|
||||
catch (IOException e)
|
||||
{
|
||||
@@ -213,7 +213,7 @@ namespace Tgstation.Server.Host.Components.StaticFiles
|
||||
{
|
||||
IsDirectory = false,
|
||||
Path = ioManager.ConcatPath(configurationRelativePath, x),
|
||||
}));
|
||||
}).OrderBy(file => file.Path));
|
||||
}
|
||||
|
||||
using (await SemaphoreSlimContext.Lock(semaphore, cancellationToken).ConfigureAwait(false))
|
||||
|
||||
Reference in New Issue
Block a user