Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix usage of old ERR_FAIL macro when new variant intended. #31234

Merged
merged 1 commit into from
Aug 9, 2019

Conversation

profan
Copy link
Contributor

@profan profan commented Aug 9, 2019

So I managed to get this sin into master with it still building successfully somehow, I'd have expected this to cause a build failure:

SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_small);
err = GetLastError();
ERR_FAIL_COND(err, "Error setting ICON_SMALL: " + format_error_message(err) + ".");
SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)icon_big);
err = GetLastError();
ERR_FAIL_COND(err, "Error setting ICON_BIG: " + format_error_message(err) + ".");

I went over the last code changes again and I think I didn't leave any more instances like this in.

Relates to #31227

@profan
Copy link
Contributor Author

profan commented Aug 9, 2019

In fact, looking at the appveyor build reveals this: https://ci.appveyor.com/project/akien-mga/godot/builds/26582781#L97 (where it's just a warning instead of an error, argh!)

@akien-mga akien-mga added this to the 3.2 milestone Aug 9, 2019
@akien-mga akien-mga merged commit 7bc984c into godotengine:master Aug 9, 2019
@akien-mga
Copy link
Member

Thanks!

@profan profan deleted the hotfix/err-explain-old branch August 9, 2019 12:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants