Fixed unguarded calls to monitor callback.

ago%!(EXTRA string=12 years) · f9d1a37621
parent 3498163da1
commit f9d1a37621
2 changed files with 5 additions and 2 deletions
--- a/README.md
+++ b/README.md
@ -461,6 +461,7 @@ skills.
 * Matt Arsenault
 * Keith Bauer
 * John Bartholomew
+ * Niklas Bergström
 * blanco
 * Lambert Clara
 * Noel Cower
--- a/src/monitor.c
+++ b/src/monitor.c
@ -140,7 +140,8 @@ void _glfwInputMonitorChange(void)
                window->monitor = NULL;
        }

-        _glfw.monitorCallback((GLFWmonitor*) monitors[i], GLFW_DISCONNECTED);
+        if (_glfw.monitorCallback)
+            _glfw.monitorCallback((GLFWmonitor*) monitors[i], GLFW_DISCONNECTED);
    }

    // Find and report newly connected monitors (not in the old list)
@ -161,7 +162,8 @@ void _glfwInputMonitorChange(void)
        if (j < monitorCount)
            continue;

-        _glfw.monitorCallback((GLFWmonitor*) _glfw.monitors[i], GLFW_CONNECTED);
+        if (_glfw.monitorCallback)
+            _glfw.monitorCallback((GLFWmonitor*) _glfw.monitors[i], GLFW_CONNECTED);
    }

    _glfwDestroyMonitors(monitors, monitorCount);