The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-13 00:58:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

InputConfigDiag: Don't prevent closing dialog if device not found

Browse Source 
There is no reason to prevent the user from closing the config dialog
if the device is not found. It's not very good UX…

Also fixes ExpressionParser to return NO_DEVICE if the device doesn't
exist instead of SUCCESS.
This commit is contained in:
Léo Lam
2016-07-13 16:51:19 +02:00
parent be9416c462
commit 77fab5940c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Core/InputCommon/ControllerInterface/ExpressionParser.cpp
View File

@ -401,7 +401,7 @@ private:
if (control == nullptr)
{
*expr_out = new DummyExpression(tok.qualifier);
return EXPRESSION_PARSE_SUCCESS;
return EXPRESSION_PARSE_NO_DEVICE;
}
*expr_out = new ControlExpression(tok.qualifier, device, control);
@ -427,13 +427,12 @@ private:
ExpressionParseStatus Unary(ExpressionNode** expr_out)
{
ExpressionParseStatus status;
if (IsUnaryExpression(Peek().type))
{
Token tok = Chew();
ExpressionNode* atom_expr;
if ((status = Atom(&atom_expr)) != EXPRESSION_PARSE_SUCCESS)
ExpressionParseStatus status = Atom(&atom_expr);
if (status == EXPRESSION_PARSE_SYNTAX_ERROR)
return status;
*expr_out = new UnaryExpression(tok.type, atom_expr);
return EXPRESSION_PARSE_SUCCESS;
@ -457,16 +456,16 @@ private:
ExpressionParseStatus Binary(ExpressionNode** expr_out)
{
ExpressionParseStatus status;
if ((status = Unary(expr_out)) != EXPRESSION_PARSE_SUCCESS)
ExpressionParseStatus status = Unary(expr_out);
if (status == EXPRESSION_PARSE_SYNTAX_ERROR)
return status;
while (IsBinaryToken(Peek().type))
{
Token tok = Chew();
ExpressionNode* unary_expr;
if ((status = Unary(&unary_expr)) != EXPRESSION_PARSE_SUCCESS)
status = Unary(&unary_expr);
if (status == EXPRESSION_PARSE_SYNTAX_ERROR)
{
delete *expr_out;
return status;