sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix nullref exceptions and redundant explicit type

Browse Source
This commit is contained in:
Shivam
2020-06-24 02:13:28 +02:00
parent c32ef5e718
commit af11340849
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Tests/NonVisual/CustomDataDirectoryTest.cs
View File

@ -152,13 +152,13 @@ namespace osu.Game.Tests.NonVisual
Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache"))); Assert.That(!host.Storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache"))); Assert.That(storage.ExistsDirectory(Path.Combine("test-nested", "cache")));
foreach (var file in osuStorage.IgnoreFiles) foreach (var file in osuStorage?.IgnoreFiles ?? Array.Empty<string>())
{ {
Assert.That(host.Storage.Exists(file), Is.True); Assert.That(host.Storage.Exists(file), Is.True);
Assert.That(storage.Exists(file), Is.False); Assert.That(storage.Exists(file), Is.False);
} }
foreach (var dir in osuStorage.IgnoreDirectories) foreach (var dir in osuStorage?.IgnoreDirectories ?? Array.Empty<string>())
{ {
Assert.That(host.Storage.ExistsDirectory(dir), Is.True); Assert.That(host.Storage.ExistsDirectory(dir), Is.True);
Assert.That(storage.ExistsDirectory(dir), Is.False); Assert.That(storage.ExistsDirectory(dir), Is.False);

3
osu.Game.Tournament/Components/TourneyVideo.cs
View File

@ -30,8 +30,7 @@ namespace osu.Game.Tournament.Components
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(Storage storage) private void load(Storage storage)
{ {
var tournamentStorage = storage as TournamentStorage; var stream = (storage as TournamentStorage)?.VideoStore.GetStream(filename);
var stream = tournamentStorage.VideoStore.GetStream(filename);
if (stream != null) if (stream != null)
{ {

4
osu.Game/IO/MigratableStorage.cs
View File

@ -14,8 +14,8 @@ namespace osu.Game.IO
/// </summary> /// </summary>
public abstract class MigratableStorage : WrappedStorage public abstract class MigratableStorage : WrappedStorage
{ {
internal virtual string[] IgnoreDirectories => new string[] { }; internal virtual string[] IgnoreDirectories => Array.Empty<string>();
internal virtual string[] IgnoreFiles => new string[] { }; internal virtual string[] IgnoreFiles => Array.Empty<string>();
protected MigratableStorage(Storage storage, string subPath = null) protected MigratableStorage(Storage storage, string subPath = null)
: base(storage, subPath) : base(storage, subPath)