X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;ds=sidebyside;f=src%2Ffreeglut_init.c;h=44bb42faebde164f66de6918b840c01556fd7755;hb=e31cce4d7a8789dc9c0dc723c4c13e719ad2db86;hp=194248a4ded782932f9fc5aff23e32275535ccd7;hpb=20c326dd70f34697350611e53ad6fe5435b5240f;p=freeglut

diff --git a/src/freeglut_init.c b/src/freeglut_init.c
index 194248a..44bb42f 100644
--- a/src/freeglut_init.c
+++ b/src/freeglut_init.c
@@ -390,7 +390,12 @@ static void fghInitialize( const char* displayName )
 #endif
 
     fgState.Initialised = GL_TRUE;
+
+    /* Avoid registering atexit callback on Win32 as it results in an access
+     * violation due to calling into a module which has been unloaded. */
+#ifndef TARGET_HOST_MS_WINDOWS
     atexit(fgDeinitialize);
+#endif
 
     /* InputDevice uses GlutTimerFunc(), so fgState.Initialised must be TRUE */
     fgInitialiseInputDevices();