diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-09 14:24:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-09 14:24:11 +0200 |
| commit | 7bc984cd67fbc4a76e107d0e6f7d2c3fa2ba9de7 (patch) | |
| tree | 06d22131619f12ec55483efdcd1564d06ddd0158 | |
| parent | 3ea33c0e455f5e52b73ae5da51d0000e8decef7b (diff) | |
| parent | 7d0c8a90413243fe7b4931c6ec9aca802b36d673 (diff) | |
Merge pull request #31234 from profan/hotfix/err-explain-old
Fix usage of old ERR_FAIL macro when new variant intended.
| -rw-r--r-- | platform/windows/os_windows.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index a6ce9148f0..be325381bb 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -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); |