From a590cf17aae6196ef37b6aa4c89ad59df67920cd Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Tue, 5 Jan 2016 18:45:20 -0400 Subject: [PATCH] The default error handler resets the mouse cursor now. --- src/scripts/boot.lua | 3 +++ src/scripts/boot.lua.h | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/scripts/boot.lua b/src/scripts/boot.lua index 947b4cc1f..3d87fb90f 100644 --- a/src/scripts/boot.lua +++ b/src/scripts/boot.lua @@ -584,6 +584,9 @@ function love.errhand(msg) love.mouse.setVisible(true) love.mouse.setGrabbed(false) love.mouse.setRelativeMode(false) + if love.mouse.hasCursor() then + love.mouse.setCursor() + end end if love.joystick then -- Stop all joystick vibrations. diff --git a/src/scripts/boot.lua.h b/src/scripts/boot.lua.h index b8bbaba92..5c61427b8 100644 --- a/src/scripts/boot.lua.h +++ b/src/scripts/boot.lua.h @@ -1064,6 +1064,11 @@ const unsigned char boot_lua[] = 0x61, 0x62, 0x62, 0x65, 0x64, 0x28, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x29, 0x0a, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2e, 0x73, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x28, 0x66, 0x61, 0x6c, 0x73, 0x65, 0x29, 0x0a, + 0x09, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2e, 0x68, 0x61, + 0x73, 0x43, 0x75, 0x72, 0x73, 0x6f, 0x72, 0x28, 0x29, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a, + 0x09, 0x09, 0x09, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6d, 0x6f, 0x75, 0x73, 0x65, 0x2e, 0x73, 0x65, 0x74, 0x43, + 0x75, 0x72, 0x73, 0x6f, 0x72, 0x28, 0x29, 0x0a, + 0x09, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x65, 0x6e, 0x64, 0x0a, 0x09, 0x69, 0x66, 0x20, 0x6c, 0x6f, 0x76, 0x65, 0x2e, 0x6a, 0x6f, 0x79, 0x73, 0x74, 0x69, 0x63, 0x6b, 0x20, 0x74, 0x68, 0x65, 0x6e, 0x0a,