epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed duplicate asset selection in asset browser.

Browse Source
This commit is contained in:
IceReaper
2023-05-14 21:30:41 +02:00
committed by Gustas
parent f4dc29f9db
commit 0751b30d33
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/AssetBrowserLogic.cs
View File

@@ -516,7 +516,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var fileExtension = Path.GetExtension(filename.ToLowerInvariant()); var fileExtension = Path.GetExtension(filename.ToLowerInvariant());
if (allowedSpriteExtensions.Contains(fileExtension)) if (allowedSpriteExtensions.Contains(fileExtension))
{ {
currentSprites = spriteCache[filename]; currentSprites = spriteCache[prefix + filename];
currentFrame = 0; currentFrame = 0;
if (frameSlider != null && currentSprites?.Length > 0) if (frameSlider != null && currentSprites?.Length > 0)
@@ -530,7 +530,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
else if (allowedModelExtensions.Contains(fileExtension)) else if (allowedModelExtensions.Contains(fileExtension))
{ {
var voxelName = Path.GetFileNameWithoutExtension(filename); var voxelName = Path.GetFileNameWithoutExtension(filename);
currentVoxel = world.ModelCache.GetModel(voxelName); currentVoxel = world.ModelCache.GetModel(prefix + voxelName);
currentSprites = null; currentSprites = null;
} }
else if (allowedAudioExtensions.Contains(fileExtension)) else if (allowedAudioExtensions.Contains(fileExtension))
@@ -558,7 +558,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
// Mute music so it doesn't interfere with the current asset. // Mute music so it doesn't interfere with the current asset.
MuteSounds(); MuteSounds();
var video = VideoLoader.GetVideo(Game.ModData.DefaultFileSystem.Open(filename), true, Game.ModData.VideoLoaders); var video = VideoLoader.GetVideo(Game.ModData.DefaultFileSystem.Open(prefix + filename), true, Game.ModData.VideoLoaders);
if (video != null) if (video != null)
{ {
player = panel.Get<VideoPlayerWidget>("PLAYER"); player = panel.Get<VideoPlayerWidget>("PLAYER");