External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-14 04:32:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

GH-1993 swap min/max memory settings when they are the wrong way around

Browse Source
This commit is contained in:
Petr Mrázek
2017-09-27 12:45:07 +02:00
parent 79d208795c
commit 9a2d203c0d
4 changed files with 73 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/MultiMC.cpp
View File

@@ -1125,8 +1125,19 @@ MainWindow* MultiMC::showMainWindow(bool minimized)
* cd4 = CPU architecture
*/
QVariantMap customValues;
customValues["cm1"] = m_settings->get("MinMemAlloc");
customValues["cm2"] = m_settings->get("MaxMemAlloc");
int min = m_settings->get("MinMemAlloc").toInt();
int max = m_settings->get("MaxMemAlloc").toInt();
if(min < max)
{
customValues["cm1"] = min;
customValues["cm2"] = max;
}
else
{
customValues["cm1"] = max;
customValues["cm2"] = min;
}
constexpr uint64_t Mega = 1024ull * 1024ull;
int ramSize = int(Sys::getSystemRam() / Mega);
qDebug() << "RAM size is" << ramSize << "MB";