mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-07-05 04:18:53 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE Avoid name collisions even with long names

Browse Source
This commit is contained in:
janrupf 2019-06-17 17:31:45 +02:00 committed by Petr Mrázek
parent 9db802b468
commit 91bf81b621
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/logic/FileSystem.cpp
View File

@ -321,7 +321,7 @@ QString DirNameFromString(QString string, QString inDir)
}
else
{
dirName = baseName + QString::number(num);;
dirName = baseName + QString::number(num);
}
// If it's over 9000

7
api/logic/InstanceList.cpp
View File

@ -807,7 +807,12 @@ bool InstanceList::commitStagedInstance(const QString& path, const QString& inst
{
QString instID = FS::DirNameFromString(instanceName, m_instDir);
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);
QString destination = FS::PathCombine(m_instDir, instanceDirName);