piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-25 07:09:48 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10131 from malleoz/hotkey-syntax-fix

Browse Source 
IOWindow: Do not accept on syntax errors
This commit is contained in:
Léo Lam
2021-10-06 00:27:06 +02:00
committed by GitHub
parent a6023c1f79 556323561c
commit bf6a278c04
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/DolphinQt/Config/Mapping/IOWindow.cpp
View File

@ -509,15 +509,17 @@ void IOWindow::OnDialogButtonPressed(QAbstractButton* button)
const auto lock = ControllerEmu::EmulatedController::GetStateLock(); const auto lock = ControllerEmu::EmulatedController::GetStateLock();
UpdateExpression(m_expression_text->toPlainText().toStdString()); UpdateExpression(m_expression_text->toPlainText().toStdString());
m_original_expression = m_reference->GetExpression();
if (ciface::ExpressionParser::ParseStatus::SyntaxError == m_reference->GetParseStatus()) if (ciface::ExpressionParser::ParseStatus::SyntaxError == m_reference->GetParseStatus())
{ {
ModalMessageBox::warning(this, tr("Error"), tr("The expression contains a syntax error.")); ModalMessageBox::warning(this, tr("Error"), tr("The expression contains a syntax error."));
} }
else
// must be the OK button {
accept(); // must be the OK button
m_original_expression = m_reference->GetExpression();
accept();
}
} }
void IOWindow::OnDetectButtonPressed() void IOWindow::OnDetectButtonPressed()