From a705abd4624d0a27880b9e394c5b89e28f765754 Mon Sep 17 00:00:00 2001 From: fayjf Date: Sat, 17 Dec 2011 13:19:25 +0000 Subject: [PATCH] Removing the "atexit ( fgDeinitialize )" call from the Windows code per e-mail trail culminating in a message from Martin Payne dated 12/17/11 at 4:43 AM git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@956 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut/freeglut/src/freeglut_init.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/freeglut/freeglut/src/freeglut_init.c b/freeglut/freeglut/src/freeglut_init.c index 194248a..44bb42f 100644 --- a/freeglut/freeglut/src/freeglut_init.c +++ b/freeglut/freeglut/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();