Merge pull request #487 from lwahlmeier/master

fixed else error case for eqtime table
This commit is contained in:
Alex 2016-01-21 21:46:36 -08:00
commit a22df6da33

View File

@ -2185,8 +2185,7 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
std::string query = StringFormat("SELECT minute,hour,day,month,year,realtime FROM eqtime limit 1"); std::string query = StringFormat("SELECT minute,hour,day,month,year,realtime FROM eqtime limit 1");
auto results = QueryDatabase(query); auto results = QueryDatabase(query);
if (!results.Success() || results.RowCount() == 0) if (!results.Success() || results.RowCount() == 0){
{
Log.Out(Logs::Detail, Logs::World_Server, "Loading EQ time of day failed. Using defaults."); Log.Out(Logs::Detail, Logs::World_Server, "Loading EQ time of day failed. Using defaults.");
eqTime.minute = 0; eqTime.minute = 0;
eqTime.hour = 9; eqTime.hour = 9;
@ -2195,7 +2194,7 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
eqTime.year = 3100; eqTime.year = 3100;
realtime = time(0); realtime = time(0);
} }
else{
auto row = results.begin(); auto row = results.begin();
eqTime.minute = atoi(row[0]); eqTime.minute = atoi(row[0]);
@ -2204,6 +2203,7 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
eqTime.month = atoi(row[3]); eqTime.month = atoi(row[3]);
eqTime.year = atoi(row[4]); eqTime.year = atoi(row[4]);
realtime = atoi(row[5]); realtime = atoi(row[5]);
}
return eqTime; return eqTime;
} }