Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Corysia Taware
2014-04-07 10:05:46 -07:00
21 changed files with 375 additions and 76 deletions
+1 -1
View File
@@ -461,7 +461,7 @@ int main(int argc, char** argv) {
if (InterserverTimer.Check()) {
InterserverTimer.Start();
database.ping();
AsyncLoadVariables(dbasync, &database);
// AsyncLoadVariables(dbasync, &database);
ReconnectCounter++;
if (ReconnectCounter >= 12) { // only create thread to reconnect every 10 minutes. previously we were creating a new thread every 10 seconds
ReconnectCounter = 0;