Commit 5c1ec528 authored by Ryan C. Gordon's avatar Ryan C. Gordon

Handle assert init/quit better.

Don't create a mutex unles we need to, only clean it up if we made it.

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404415
parent c47e208c
...@@ -422,12 +422,7 @@ SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file, ...@@ -422,12 +422,7 @@ SDL_ReportAssertion(SDL_assert_data *data, const char *func, const char *file,
int SDL_AssertionsInit(void) int SDL_AssertionsInit(void)
{ {
#if (SDL_ASSERT_LEVEL > 0) /* this is a no-op at the moment. */
assertion_mutex = SDL_CreateMutex();
if (assertion_mutex == NULL) {
return -1;
}
#endif
return 0; return 0;
} }
...@@ -435,8 +430,10 @@ void SDL_AssertionsQuit(void) ...@@ -435,8 +430,10 @@ void SDL_AssertionsQuit(void)
{ {
#if (SDL_ASSERT_LEVEL > 0) #if (SDL_ASSERT_LEVEL > 0)
SDL_GenerateAssertionReport(); SDL_GenerateAssertionReport();
SDL_DestroyMutex(assertion_mutex); if (assertion_mutex != NULL) {
assertion_mutex = NULL; SDL_DestroyMutex(assertion_mutex);
assertion_mutex = NULL;
}
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment