From e0b43c5ae6c88f3e5c47bdfdfc2e640da1f56686 Mon Sep 17 00:00:00 2001 From: manongjohn Date: Dec 03 2019 04:59:20 +0000 Subject: Block name generation of reserved names --- diff --git a/toonz/sources/toonzlib/namebuilder.cpp b/toonz/sources/toonzlib/namebuilder.cpp index 4d0dba3..f4b71c0 100644 --- a/toonz/sources/toonzlib/namebuilder.cpp +++ b/toonz/sources/toonzlib/namebuilder.cpp @@ -33,6 +33,16 @@ std::wstring NameCreator::getNext() { } std::wstring s; for (i = n - 1; i >= 0; i--) s.append(1, (wchar_t)(L'A' + m_s[i])); + +#ifdef _WIN32 + std::vector invalidNames{L"AUX", L"COM", L"CON", + L"LPT", L"NUL", L"PRN"}; + // If we're an invalid combination, let's check the next one + if (std::find(invalidNames.begin(), invalidNames.end(), s) != + invalidNames.end()) + return getNext(); +#endif + return s; }