Skip to content

Commit

Permalink
Merge pull request #31234 from profan/hotfix/err-explain-old
Browse files Browse the repository at this point in the history
Fix usage of old ERR_FAIL macro when new variant intended.
  • Loading branch information
akien-mga authored Aug 9, 2019
2 parents 3ea33c0 + 7d0c8a9 commit 7bc984c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions platform/windows/os_windows.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2743,11 +2743,11 @@ void OS_Windows::set_native_icon(const String &p_filename) {

SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_small);
err = GetLastError();
ERR_FAIL_COND(err, "Error setting ICON_SMALL: " + format_error_message(err) + ".");
ERR_FAIL_COND_MSG(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) + ".");
ERR_FAIL_COND_MSG(err, "Error setting ICON_BIG: " + format_error_message(err) + ".");

memdelete(f);
memdelete(icon_dir);
Expand Down

0 comments on commit 7bc984c

Please sign in to comment.