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

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
commit bf6a278c04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

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