Moved glfwTerminate window closing to shared code.

master
Camilla Berglund ago%!(EXTRA string=15 years)
parent 0d39fbec58
commit d7670cf906
  1. 4
      src/init.c
  2. 3
      src/win32/win32_init.c
  3. 3
      src/x11/x11_init.c

@ -70,6 +70,10 @@ GLFWAPI void glfwTerminate(void)
if (!_glfwInitialized) if (!_glfwInitialized)
return; return;
// Close all remaining windows
while (_glfwLibrary.windowListHead)
glfwCloseWindow(_glfwLibrary.windowListHead);
if (!_glfwPlatformTerminate()) if (!_glfwPlatformTerminate())
return; return;

@ -178,9 +178,6 @@ int _glfwPlatformInit(void)
int _glfwPlatformTerminate(void) int _glfwPlatformTerminate(void)
{ {
while (_glfwLibrary.windowListHead)
glfwCloseWindow(_glfwLibrary.windowListHead);
if (_glfwLibrary.Win32.classAtom) if (_glfwLibrary.Win32.classAtom)
{ {
UnregisterClass(_GLFW_WNDCLASSNAME, _glfwLibrary.Win32.instance); UnregisterClass(_GLFW_WNDCLASSNAME, _glfwLibrary.Win32.instance);

@ -220,9 +220,6 @@ int _glfwPlatformInit(void)
int _glfwPlatformTerminate(void) int _glfwPlatformTerminate(void)
{ {
while (_glfwLibrary.windowListHead)
glfwCloseWindow(_glfwLibrary.windowListHead);
if (_glfwLibrary.X11.cursor) if (_glfwLibrary.X11.cursor)
{ {
XFreeCursor(_glfwLibrary.X11.display, _glfwLibrary.X11.cursor); XFreeCursor(_glfwLibrary.X11.display, _glfwLibrary.X11.cursor);

Loading…
Cancel
Save