mirror of
https://github.com/KillzXGaming/Switch-Toolbox
synced 2024-11-22 20:43:09 +00:00
Fix archive folder paths
This commit is contained in:
parent
1099da76a3
commit
025590f54b
1 changed files with 4 additions and 3 deletions
|
@ -654,7 +654,7 @@ namespace Toolbox
|
||||||
if (ext.TitleBarExtensions != null)
|
if (ext.TitleBarExtensions != null)
|
||||||
RegisterMenuExtIndex(menuStrip1, ext.TitleBarExtensions, menuStrip1.Items.Count);
|
RegisterMenuExtIndex(menuStrip1, ext.TitleBarExtensions, menuStrip1.Items.Count);
|
||||||
// if (ext.MapEditorMenuExtensions != null)
|
// if (ext.MapEditorMenuExtensions != null)
|
||||||
// RegisterMenuExtIndex(mapEditorsToolStripMenuItem, ext.MapEditorMenuExtensions, mapEditorsToolStripMenuItem.DropDownItems.Count);
|
// RegisterMenuExtIndex(mapEditorsToolStripMenuItem, ext.MapEditorMenuExtensions, mapEditorsToolStripMenuItem.DropDownItems.Count);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1514,8 +1514,9 @@ namespace Toolbox
|
||||||
private void SearchArchive(BatchFormatExport.Settings settings, IArchiveFile archiveFile,
|
private void SearchArchive(BatchFormatExport.Settings settings, IArchiveFile archiveFile,
|
||||||
string extension, string outputFolder, ExportMode exportMode)
|
string extension, string outputFolder, ExportMode exportMode)
|
||||||
{
|
{
|
||||||
string ArchiveFilePath = Path.Combine(outputFolder, Path.GetFileNameWithoutExtension(((IFileFormat)archiveFile).FileName));
|
string ArchiveFilePath = outputFolder;
|
||||||
ArchiveFilePath = outputFolder;
|
if (settings.SeperateArchiveFiles)
|
||||||
|
ArchiveFilePath = Path.Combine(outputFolder, Path.GetFileNameWithoutExtension(((IFileFormat)archiveFile).FileName));
|
||||||
|
|
||||||
foreach (var file in archiveFile.Files)
|
foreach (var file in archiveFile.Files)
|
||||||
SearchFileFormat(settings, file.OpenFile(), extension, ArchiveFilePath, exportMode);
|
SearchFileFormat(settings, file.OpenFile(), extension, ArchiveFilePath, exportMode);
|
||||||
|
|
Loading…
Reference in a new issue