diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-25 07:21:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 07:21:44 +0200 |
| commit | eb300ba8fe48a76d31b97564eb34c58c355cdbd5 (patch) | |
| tree | 9992e8468d39d4b98b728c7b2c1d0aa24b67a892 /platform | |
| parent | ad0d87b4dddfe6b9e88510dd526bcd4028ba3030 (diff) | |
| parent | c3f69c6c76a0495b6730d2483e64a31ee3a1d4ad (diff) | |
Merge pull request #30799 from guilhermefelipecgs/fix_30795
Fix crash when using custom cursor
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/osx/os_osx.mm | 1 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 1 | ||||
| -rw-r--r-- | platform/x11/os_x11.cpp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 726882438b..992aff54f1 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -1599,6 +1599,7 @@ void OS_OSX::finalize() { memdelete(joypad_osx); memdelete(input); + cursors_cache.clear(); visual_server->finish(); memdelete(visual_server); //memdelete(rasterizer); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 745f3ce379..4c7e35ed88 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -1537,6 +1537,7 @@ void OS_Windows::finalize() { memdelete(camera_server); touch_state.clear(); + cursors_cache.clear(); visual_server->finish(); memdelete(visual_server); #ifdef OPENGL_ENABLED diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 9b35648046..36bf51e7f9 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -788,6 +788,7 @@ void OS_X11::finalize() { memdelete(camera_server); + cursors_cache.clear(); visual_server->finish(); memdelete(visual_server); //memdelete(rasterizer); |