Merge remote-tracking branch 'sequelpro/master'

sequelpro · Mar 10, 2017 · c866a5b · c866a5b
2 parents 833d872 + cbfadab
commit c866a5b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m b/Frameworks/SPMySQLFramework/Source/SPMySQLConnection Categories/Ping & KeepAlive.m
@@ -81,8 +81,10 @@ - (void)_keepAlive
  */
 - (void)_threadedKeepAlive
 {
-	if(keepAliveThread) {
-		NSLog(@"warning: overwriting existing keepAliveThread: %@, results may be unpredictable!",keepAliveThread);
+	@synchronized(self) {
+		if(keepAliveThread) {
+			NSLog(@"warning: overwriting existing keepAliveThread: %@, results may be unpredictable!",keepAliveThread);
+		}
 	}
 
 	keepAliveThread = [NSThread currentThread];
@@ -114,7 +116,9 @@ - (void)_threadedKeepAlive
 		keepAlivePingFailures++;
 	}
 end_cleanup:
-	keepAliveThread = nil;
+	@synchronized(self) {
+		keepAliveThread = nil;
+	}
 }
 
 #pragma mark -