From 2acac1b312b0942bce4f3120d8c85f6882a646c9 Mon Sep 17 00:00:00 2001 From: Razmoth <12517189-Razmoth@users.noreply.gitlab.com> Date: Fri, 4 Nov 2022 15:35:35 +0400 Subject: [PATCH] Revert ByContainer changes. --- AssetStudioCLI/Studio.cs | 2 +- AssetStudioGUI/Studio.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AssetStudioCLI/Studio.cs b/AssetStudioCLI/Studio.cs index aab6b46..a3b9f7a 100644 --- a/AssetStudioCLI/Studio.cs +++ b/AssetStudioCLI/Studio.cs @@ -490,7 +490,7 @@ namespace AssetStudioCLI case AssetGroupOption.ByContainer: //container path if (!string.IsNullOrEmpty(asset.Container)) { - exportPath = Path.HasExtension(asset.Container) ? Path.Combine(savePath, Path.GetFileNameWithoutExtension(asset.Container)) : Path.Combine(savePath, asset.Container); + exportPath = Path.HasExtension(asset.Container) ? Path.Combine(savePath, Path.GetDirectoryName(asset.Container)) : Path.Combine(savePath, asset.Container); } else { diff --git a/AssetStudioGUI/Studio.cs b/AssetStudioGUI/Studio.cs index 0c4fe18..4a8d43b 100644 --- a/AssetStudioGUI/Studio.cs +++ b/AssetStudioGUI/Studio.cs @@ -617,7 +617,7 @@ namespace AssetStudioGUI case AssetGroupOption.ByContainer: //container path if (!string.IsNullOrEmpty(asset.Container)) { - exportPath = Path.HasExtension(asset.Container) ? Path.Combine(savePath, Path.GetFileNameWithoutExtension(asset.Container)) : Path.Combine(savePath, asset.Container); + exportPath = Path.HasExtension(asset.Container) ? Path.Combine(savePath, Path.GetDirectoryName(asset.Container)) : Path.Combine(savePath, asset.Container); } else {