Merge pull request #3680 from kb-1000/log-system-glfw-openal

NOISSUE print information about whether the system GLFW or OpenAL workarounds are active to the instance log
This commit is contained in:
Petr Mrázek 2021-03-26 00:37:09 +00:00 committed by GitHub
commit cc8ac7bdbe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -526,11 +526,23 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session)
out << ""; out << "";
} }
auto settings = this->settings();
bool nativeOpenAL = settings->get("UseNativeOpenAL").toBool();
bool nativeGLFW = settings->get("UseNativeGLFW").toBool();
if (nativeOpenAL || nativeGLFW)
{
if (nativeOpenAL)
out << "Using system OpenAL.";
if (nativeGLFW)
out << "Using system GLFW.";
out << "";
}
// libraries and class path. // libraries and class path.
{ {
out << "Libraries:"; out << "Libraries:";
QStringList jars, nativeJars; QStringList jars, nativeJars;
auto javaArchitecture = settings()->get("JavaArchitecture").toString(); auto javaArchitecture = settings->get("JavaArchitecture").toString();
profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath(), binRoot()); profile->getLibraryFiles(javaArchitecture, jars, nativeJars, getLocalLibraryPath(), binRoot());
auto printLibFile = [&](const QString & path) auto printLibFile = [&](const QString & path)
{ {
@ -616,14 +628,14 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session)
out << ""; out << "";
QString windowParams; QString windowParams;
if (settings()->get("LaunchMaximized").toBool()) if (settings->get("LaunchMaximized").toBool())
{ {
out << "Window size: max (if available)"; out << "Window size: max (if available)";
} }
else else
{ {
auto width = settings()->get("MinecraftWinWidth").toInt(); auto width = settings->get("MinecraftWinWidth").toInt();
auto height = settings()->get("MinecraftWinHeight").toInt(); auto height = settings->get("MinecraftWinHeight").toInt();
out << "Window size: " + QString::number(width) + " x " + QString::number(height); out << "Window size: " + QString::number(width) + " x " + QString::number(height);
} }
out << ""; out << "";