diff options
| author | Mat M <mathew1800@gmail.com> | 2018-10-12 10:29:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 10:29:28 -0400 |
| commit | ecd4897d43e115dbc00534fe74a5cc9d2c3a0fed (patch) | |
| tree | a2a879c0df72ce242ec69b51405426d2b52f3bc5 /Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | |
| parent | 7ac90b55d6263b1369defcdcc85af290add87d9a (diff) | |
| parent | 349765ba77df11a9d5eeac424ac87e0047c7f0b3 (diff) | |
Merge pull request #7437 from stenzek/graphics-options-race
Fix race condition caused by opening graphics options while running
Diffstat (limited to 'Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp')
| -rw-r--r-- | Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp index cb4c4a29d0..b8ba245256 100644 --- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp +++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp @@ -313,7 +313,7 @@ void GeneralWidget::OnBackendChanged(const QString& backend_name) const bool supports_adapters = !adapters.empty(); m_adapter_combo->setCurrentIndex(g_Config.iAdapter); - m_adapter_combo->setEnabled(supports_adapters); + m_adapter_combo->setEnabled(supports_adapters && !Core::IsRunning()); m_adapter_combo->setToolTip(supports_adapters ? QStringLiteral("") : |