Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge remote-tracking branch 'sequelpro/master'
  • Loading branch information
abhibeckert committed Mar 10, 2017
2 parents 833d872 + cbfadab commit c866a5b
Showing 1 changed file with 7 additions and 3 deletions.
Expand Up @@ -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];
Expand Down Expand Up @@ -114,7 +116,9 @@ - (void)_threadedKeepAlive
keepAlivePingFailures++;
}
end_cleanup:
keepAliveThread = nil;
@synchronized(self) {
keepAliveThread = nil;
}
}

#pragma mark -
Expand Down

0 comments on commit c866a5b

Please sign in to comment.