mirror of
https://github.com/UltimMC/Launcher.git
synced 2025-10-04 09:08:42 +00:00
Compare commits
2 Commits
feature/fi
...
feature/li
Author | SHA1 | Date | |
---|---|---|---|
|
91bf81b621 | ||
|
9db802b468 |
@@ -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
|
||||
|
@@ -805,12 +805,18 @@ QString InstanceList::getStagedInstancePath()
|
||||
|
||||
bool InstanceList::commitStagedInstance(const QString& path, const QString& instanceName, const QString& groupName)
|
||||
{
|
||||
QDir dir;
|
||||
QString instID = FS::DirNameFromString(instanceName, m_instDir);
|
||||
QString instanceDirName = instID;
|
||||
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, instID);
|
||||
if(!dir.rename(path, destination))
|
||||
QString destination = FS::PathCombine(m_instDir, instanceDirName);
|
||||
if(!QDir().rename(path, destination))
|
||||
{
|
||||
qWarning() << "Failed to move" << path << "to" << destination;
|
||||
return false;
|
||||
|
Reference in New Issue
Block a user