Browse Source

Backends: GLFW: Clear emscripten's MouseWheel callback before shutdown. (#6790, #6096, #4019)

Deal 1 year ago
parent
commit
56a7b8b724
2 changed files with 4 additions and 0 deletions
  1. 3 0
      backends/imgui_impl_glfw.cpp
  2. 1 0
      docs/CHANGELOG.txt

+ 3 - 0
backends/imgui_impl_glfw.cpp

@@ -629,6 +629,9 @@ void ImGui_ImplGlfw_Shutdown()
 
     if (bd->InstalledCallbacks)
         ImGui_ImplGlfw_RestoreCallbacks(bd->Window);
+#ifdef __EMSCRIPTEN__
+    emscripten_set_wheel_callback(EMSCRIPTEN_EVENT_TARGET_DOCUMENT, nullptr, false, nullptr);
+#endif
 
     for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++)
         glfwDestroyCursor(bd->MouseCursors[cursor_n]);

+ 1 - 0
docs/CHANGELOG.txt

@@ -47,6 +47,7 @@ Other changes:
 - InputTextMultiline: Fixed a crash pressing Down on last empty line of a multiline buffer.
   (regression from 1.89.2, only happened in some states). (#6783, #6000)
 - BeginListBox(): Fixed not consuming SetNextWindowXXX data when returning false.
+- Backends: GLFW: Clear emscripten's MouseWheel callback before shutdown. (#6790, #6096, #4019) [@halx99]
 
 
 -----------------------------------------------------------------------