ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: hide jvm maximum memory setting on windows 10 (issue #694)

Browse Source 
setting this value to anything other than -1 will cause Sourcetrail to get stuck when initializing the JVM
This commit is contained in:
mlangkabel
2019-08-05 18:17:07 +02:00
parent 5f91f48844
commit cc289e8b1e
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/project_wizard/content/QtProjectWizardContentPreferences.cpp
+19 -3
View File
@@ -315,6 +315,8 @@ void QtProjectWizardContentPreferences::populate(QGridLayout* layout, int& row)
m_javaPathDetector = utility::getJavaRuntimePathDetector();
addJavaPathDetection(layout, row);
}
if (QSysInfo::windowsVersion() != QSysInfo::WV_WINDOWS10)
{
// jvm max memory
m_jvmMaximumMemory = addLineEdit(
@@ -327,6 +329,11 @@ void QtProjectWizardContentPreferences::populate(QGridLayout* layout, int& row)
);
layout->setRowMinimumHeight(row - 1, 30);
}
else
{
m_jvmMaximumMemory = nullptr;
}
{
// JRE System Library
const QString title = "JRE System Library";
@@ -458,7 +465,10 @@ void QtProjectWizardContentPreferences::load()
m_javaPath->setText(QString::fromStdWString(appSettings->getJavaPath().wstr()));
}
m_jvmMaximumMemory->setText(QString::number(appSettings->getJavaMaximumMemory()));
if (m_jvmMaximumMemory)
{
m_jvmMaximumMemory->setText(QString::number(appSettings->getJavaMaximumMemory()));
}
m_jreSystemLibraryPaths->setPaths(appSettings->getJreSystemLibraryPaths());
@@ -524,8 +534,14 @@ void QtProjectWizardContentPreferences::save()
appSettings->setJreSystemLibraryPaths(m_jreSystemLibraryPaths->getPathsAsAbsolute());
int jvmMaximumMemory = m_jvmMaximumMemory->text().toInt();
if (jvmMaximumMemory) appSettings->setJavaMaximumMemory(jvmMaximumMemory);
if (m_jvmMaximumMemory)
{
const int jvmMaximumMemory = m_jvmMaximumMemory->text().toInt();
if (jvmMaximumMemory)
{
appSettings->setJavaMaximumMemory(jvmMaximumMemory);
}
}
if (m_mavenPath)
{