ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2626 from Trial97/remove_poly

Browse Source 
remove some poly mentions from the code
This commit is contained in:
Alexandru Ionut Tripon 2024-07-08 21:46:39 +03:00 committed by GitHub
commit ca2dda5547
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/InstanceList.cpp
View File

@ -372,13 +372,13 @@ void InstanceList::undoTrashInstance()
auto top = m_trashHistory.pop(); auto top = m_trashHistory.pop();
while (QDir(top.polyPath).exists()) { while (QDir(top.path).exists()) {
top.id += "1"; top.id += "1";
top.polyPath += "1"; top.path += "1";
} }
qDebug() << "Moving" << top.trashPath << "back to" << top.polyPath; qDebug() << "Moving" << top.trashPath << "back to" << top.path;
QFile(top.trashPath).rename(top.polyPath); QFile(top.trashPath).rename(top.path);
m_instanceGroupIndex[top.id] = top.groupName; m_instanceGroupIndex[top.id] = top.groupName;
increaseGroupCount(top.groupName); increaseGroupCount(top.groupName);
@ -635,8 +635,8 @@ InstancePtr InstanceList::loadInstance(const InstanceId& id)
QString inst_type = instanceSettings->get("InstanceType").toString(); QString inst_type = instanceSettings->get("InstanceType").toString();
// NOTE: Some PolyMC versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a OneSix // NOTE: Some launcher versions didn't save the InstanceType properly. We will just bank on the probability that this is probably a
// instance // OneSix instance
if (inst_type == "OneSix" || inst_type.isEmpty()) { if (inst_type == "OneSix" || inst_type.isEmpty()) {
inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot)); inst.reset(new MinecraftInstance(m_globalSettings, instanceSettings, instanceRoot));
} else { } else {

2
launcher/InstanceList.h
View File

@ -58,7 +58,7 @@ enum class GroupsState { NotLoaded, Steady, Dirty };
struct TrashHistoryItem { struct TrashHistoryItem {
QString id; QString id;
QString polyPath; QString path;
QString trashPath; QString trashPath;
QString groupName; QString groupName;
}; };