asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #31234 from profan/hotfix/err-explain-old

Browse source 
Fix usage of old ERR_FAIL macro when new variant intended.
This commit is contained in:
Rémi Verschelde 2019-08-09 14:24:11 +02:00 committed by GitHub
commit 7bc984cd67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/windows/os_windows.cpp
View file

@ -2743,11 +2743,11 @@ void OS_Windows::set_native_icon(const String &p_filename) {
SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_small); SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)icon_small);
err = GetLastError(); 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); SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)icon_big);
err = GetLastError(); 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(f);
memdelete(icon_dir); memdelete(icon_dir);