Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Fix duplicate levels of folder command (#6894)

Abel_You9fc8750883ed
diff --git a/toonz/sources/toonz/iocommand.cpp b/toonz/sources/toonz/iocommand.cpp
index eb0c01ce9..6ca036dc8 100644
--- a/toonz/sources/toonz/iocommand.cpp
+++ b/toonz/sources/toonz/iocommand.cpp
@@ -2481,7 +2481,7 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,
if (importDialog.aborted()) break;
LoadResourceArguments::ResourceData rd(args.resourceDatas[r]);
- TFilePath &path = rd.m_path;
+ TFilePath path = rd.m_path;
QString origName = path.withoutParentDir().getQString();
if (!path.isLevelName())
@@ -2489,8 +2489,13 @@ int IoCmd::loadResources(LoadResourceArguments &args, bool updateRecentFile,
// duplicate check
auto isDuplicate =
- [&rd](const IoCmd::LoadResourceArguments::ResourceData &existingRd) {
- return existingRd.m_path == rd.m_path;
+ [&path,
+ scene](const IoCmd::LoadResourceArguments::ResourceData &existingRd) {
+ if (!existingRd.m_path.isAbsolute() || !path.isAbsolute())
+ return scene->decodeFilePath(existingRd.m_path) ==
+ scene->decodeFilePath(path);
+ else
+ return existingRd.m_path == path;
};
if (std::find_if(rds.begin(), rds.end(), isDuplicate) != rds.end()) {
if (!all) {
diff --git a/toonz/sources/toonz/loadfoldercommand.cpp b/toonz/sources/toonz/loadfoldercommand.cpp
index 941f186a2..0f3efbf11 100644
--- a/toonz/sources/toonz/loadfoldercommand.cpp
+++ b/toonz/sources/toonz/loadfoldercommand.cpp
@@ -195,7 +195,7 @@ TFilePath retasResourcePath(const TFilePath &fp) {
static const FormatData l_formatDatas[] = {
// Changed QRegExp patterns to QRegularExpression
- {QRegularExpression(R"(.+\.[0-9]{4,4}.*\..*)"), &multiframeResourcePath,
+ {QRegularExpression(R"(.+[._][0-9]{4,4}.*\..*)"), &multiframeResourcePath,
nullptr},
{QRegularExpression(R"(.+[0-9]{4,4}\.tga)",
QRegularExpression::CaseInsensitiveOption),