KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
parent 1409477ed7 f825345b14
commit 532eebaefb
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 static inline void
get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xdpi, double *ydpi) { get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xdpi, double *ydpi) {
*xscale = 1; *yscale = 1;
if (w) glfwGetWindowContentScale(w, xscale, yscale); if (w) glfwGetWindowContentScale(w, xscale, yscale);
else { else {
GLFWmonitor *monitor = glfwGetPrimaryMonitor(); GLFWmonitor *monitor = glfwGetPrimaryMonitor();
@@ -440,7 +441,7 @@ get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xd
static inline void static inline void
get_window_dpi(GLFWwindow *w, double *x, double *y) { 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); get_window_content_scale(w, &xscale, &yscale, x, y);
} }