This change will either reduce the amount of crashes or increase the …

…amount of beachballing. In the latter case please file an issue.
sequelpro · Oct 17, 2015 · 4d97cbd4df1ebb451d89d6c4e12dd7c622d00b84 · 4d97cbd
1 parent 73e5d92
commit 4d97cbd4df1ebb451d89d6c4e12dd7c622d00b84
Unified Split

Showing with 3 additions and 0 deletions.

+3 −0 Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m
@@ -186,6 +186,9 @@ - (BOOL)_pingConnectionUsingLoopDelay:(NSUInteger)loopDelay
 			keepAliveLastPingBlocked = YES;
 		}
 	} while (keepAlivePingThreadActive);
+
+	//wait for thread to go away, otherwise our free() below might run before _pingThreadCleanup()
+	pthread_join(keepAlivePingThread_t, NULL);
 
 	// Clean up
 	keepAlivePingThread_t = NULL;