Merge branch '_glfwInputError_format' of https://github.com/Luflosi/kitty

This commit is contained in:
Kovid Goyal 2019-08-26 06:24:02 +05:30
commit bfe595a8e8
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 3 additions and 3 deletions

View File

@ -692,8 +692,8 @@ - (void)updateLayer
[window->context.nsgl.object update]; [window->context.nsgl.object update];
} @catch (NSException *e) { } @catch (NSException *e) {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Failed to update NSGL Context object with error: %s (%s)", "Failed to update NSGL Context object with error: %s (%s)",
[[e name] UTF8String], [[e reason] UTF8String]); [[e name] UTF8String], [[e reason] UTF8String]);
} }
} }

2
glfw/wl_window.c vendored
View File

@ -1836,7 +1836,7 @@ static inline bool _glfwEnsureDataDevice(void) {
if (!_glfw.wl.dataDevice) if (!_glfw.wl.dataDevice)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Cannot use clipboard, failed to create data device"); "Wayland: Cannot use clipboard, failed to create data device");
return false; return false;
} }
} }