From 32e77696b188bd74cb21089163e13bae1278290a Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 6 Sep 2022 10:31:27 -0400 Subject: [PATCH] Remove useless Proton wine type --- launcher/core/include/launchercore.h | 3 +-- launcher/desktop/src/settingswindow.cpp | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/launcher/core/include/launchercore.h b/launcher/core/include/launchercore.h index 379c1de..dc30333 100755 --- a/launcher/core/include/launchercore.h +++ b/launcher/core/include/launchercore.h @@ -27,8 +27,7 @@ enum class WineType { System, Custom, Builtin, // macos only - XIVOnMac, // macos only - Proton // steam proton, only available when launched via Steam + XIVOnMac // macos only }; enum class DalamudChannel { diff --git a/launcher/desktop/src/settingswindow.cpp b/launcher/desktop/src/settingswindow.cpp index 5ebb44a..b81d00f 100644 --- a/launcher/desktop/src/settingswindow.cpp +++ b/launcher/desktop/src/settingswindow.cpp @@ -486,17 +486,12 @@ void SettingsWindow::setupWineTab(QFormLayout& layout) { wineTypeCombo->insertItem(3, "XIV on Mac"); #endif - if (core.isSteam) { - wineTypeCombo->insertItem(0, "Steam Proton"); - wineTypeCombo->setEnabled(false); - } else { - wineTypeCombo->insertItem(0, "System Wine"); + wineTypeCombo->insertItem(0, "System Wine"); // custom wine selection is broken under flatpak #ifndef FLATPAK - wineTypeCombo->insertItem(1, "Custom Wine"); + wineTypeCombo->insertItem(1, "Custom Wine"); #endif - } layout.addWidget(wineTypeCombo);