From e37cf125c3c3a5aa4b7d50ce428cc82560126882 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Thu, 22 Feb 2024 19:40:24 +0200
Subject: [PATCH] Reduced temporary instance folder name

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
(cherry picked from commit 726b0ffb3b0488bd289d85feacea31066c464a45)
---
 launcher/InstanceList.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/launcher/InstanceList.cpp b/launcher/InstanceList.cpp
index c884a4f12..c663d22d0 100644
--- a/launcher/InstanceList.cpp
+++ b/launcher/InstanceList.cpp
@@ -38,6 +38,7 @@
 #include <QDir>
 #include <QDirIterator>
 #include <QFile>
+#include <QFileInfo>
 #include <QFileSystemWatcher>
 #include <QJsonArray>
 #include <QJsonDocument>
@@ -933,8 +934,12 @@ Task* InstanceList::wrapInstanceTask(InstanceTask* task)
 
 QString InstanceList::getStagedInstancePath()
 {
-    QString key = QUuid::createUuid().toString(QUuid::WithoutBraces);
     QString tempDir = ".LAUNCHER_TEMP/";
+    auto tempPath = FS::PathCombine(m_instDir, tempDir);
+    if (QFileInfo::exists(tempPath)) {
+        FS::deletePath(tempPath);  // clean the path to prevent any collisions
+    }
+    QString key = QUuid::createUuid().toString(QUuid::WithoutBraces).left(6);  // reduce the size from 36 to 6
     QString relPath = FS::PathCombine(tempDir, key);
     QDir rootPath(m_instDir);
     auto path = FS::PathCombine(m_instDir, relPath);
@@ -942,7 +947,6 @@ QString InstanceList::getStagedInstancePath()
         return QString();
     }
 #ifdef Q_OS_WIN32
-    auto tempPath = FS::PathCombine(m_instDir, tempDir);
     SetFileAttributesA(tempPath.toStdString().c_str(), FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_NOT_CONTENT_INDEXED);
 #endif
     return path;