mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-10-06 06:50:16 +00:00
NOISSUE Avoid name collisions even with long names
This commit is contained in:
parent
9db802b468
commit
91bf81b621
@ -321,7 +321,7 @@ QString DirNameFromString(QString string, QString inDir)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
dirName = baseName + QString::number(num);;
|
dirName = baseName + QString::number(num);
|
||||||
}
|
}
|
||||||
|
|
||||||
// If it's over 9000
|
// If it's over 9000
|
||||||
|
@ -807,7 +807,12 @@ bool InstanceList::commitStagedInstance(const QString& path, const QString& inst
|
|||||||
{
|
{
|
||||||
QString instID = FS::DirNameFromString(instanceName, m_instDir);
|
QString instID = FS::DirNameFromString(instanceName, m_instDir);
|
||||||
QString instanceDirName = instID;
|
QString instanceDirName = instID;
|
||||||
instanceDirName.truncate(180);
|
if(instanceDirName.length() > 180)
|
||||||
|
{
|
||||||
|
instanceDirName.truncate(176);
|
||||||
|
instanceDirName += instID.at(instID.length() - 4); // In case the last 4 chars were changed
|
||||||
|
// to prevent double folder names
|
||||||
|
}
|
||||||
{
|
{
|
||||||
WatchLock lock(m_watcher, m_instDir);
|
WatchLock lock(m_watcher, m_instDir);
|
||||||
QString destination = FS::PathCombine(m_instDir, instanceDirName);
|
QString destination = FS::PathCombine(m_instDir, instanceDirName);
|
||||||
|
Loading…
Reference in New Issue
Block a user