Mercurial > sdl-ios-xcode
comparison src/events/SDL_events.c @ 3611:57823d017f02
Merged r4121:4122 from branches/SDL-1.2: more double-free fixes.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Wed, 06 Jan 2010 07:34:20 +0000 |
parents | 0d1b16ee0bca |
children | f7b03b6838cb |
comparison
equal
deleted
inserted
replaced
3610:3c1b39d0d1a6 | 3611:57823d017f02 |
---|---|
174 SDL_EventQ.active = 0; | 174 SDL_EventQ.active = 0; |
175 if (SDL_EventThread) { | 175 if (SDL_EventThread) { |
176 SDL_WaitThread(SDL_EventThread, NULL); | 176 SDL_WaitThread(SDL_EventThread, NULL); |
177 SDL_EventThread = NULL; | 177 SDL_EventThread = NULL; |
178 SDL_DestroyMutex(SDL_EventLock.lock); | 178 SDL_DestroyMutex(SDL_EventLock.lock); |
179 SDL_EventLock.lock = NULL; | |
179 } | 180 } |
180 if (SDL_EventQ.lock) { | 181 if (SDL_EventQ.lock) { |
181 SDL_DestroyMutex(SDL_EventQ.lock); | 182 SDL_DestroyMutex(SDL_EventQ.lock); |
182 SDL_EventQ.lock = NULL; | 183 SDL_EventQ.lock = NULL; |
183 } | 184 } |