CERBERUS/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty.git synced 2026-06-20 14:15:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'fix-garbage-pointer-dereference' of https://github.com/Luflosi/kitty into master

Browse source
This commit is contained in:
Kovid Goyal 2020-10-16 07:35:31 +05:30
commit 532eebaefb
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kitty/glfw.c
View file

@ -421,6 +421,7 @@ make_os_window_context_current(OSWindow *w) {
static inline void
get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xdpi, double *ydpi) {
*xscale = 1; *yscale = 1;
if (w) glfwGetWindowContentScale(w, xscale, yscale);
else {
GLFWmonitor *monitor = glfwGetPrimaryMonitor();
@ -440,7 +441,7 @@ get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xd
static inline void
get_window_dpi(GLFWwindow *w, double *x, double *y) {
float xscale = 1, yscale = 1;
float xscale, yscale;
get_window_content_scale(w, &xscale, &yscale, x, y);
}