diff --git a/mythtv/programs/mythbackend/housekeeper.cpp b/mythtv/programs/mythbackend/housekeeper.cpp
index db4012a..e66a0c6 100644
a
|
b
|
void HouseKeeper::RunHouseKeeping(void) |
202 | 202 | houseKeepingWait.wakeAll(); |
203 | 203 | } |
204 | 204 | |
205 | | int period, maxhr, minhr; |
206 | 205 | QString dbTag; |
207 | 206 | bool initialRun = true; |
208 | 207 | |
… |
… |
void HouseKeeper::RunHouseKeeping(void) |
242 | 241 | } |
243 | 242 | else |
244 | 243 | { |
245 | | period = 1; |
246 | | minhr = gCoreContext->GetNumSetting("MythFillMinHour", -1); |
247 | | if (minhr == -1) |
248 | | { |
249 | | minhr = 0; |
250 | | maxhr = 24; |
251 | | } |
252 | | else |
253 | | { |
254 | | maxhr = gCoreContext->GetNumSetting("MythFillMaxHour", 24); |
255 | | } |
256 | | |
257 | 244 | bool grabberSupportsNextTime = false; |
258 | 245 | MSqlQuery result(MSqlQuery::InitCon()); |
259 | 246 | if (result.isConnected()) |
… |
… |
void HouseKeeper::RunHouseKeeping(void) |
266 | 253 | if ((result.exec()) && |
267 | 254 | (result.next()) && |
268 | 255 | (result.value(0).toInt() > 0)) |
269 | | grabberSupportsNextTime = true; |
| 256 | { |
| 257 | grabberSupportsNextTime = |
| 258 | gCoreContext->GetNumSetting( |
| 259 | "MythFillGrabberSuggestsTime", 1); |
| 260 | } |
270 | 261 | } |
271 | 262 | |
272 | 263 | bool runMythFill = false; |
273 | | if (grabberSupportsNextTime && |
274 | | gCoreContext->GetNumSetting("MythFillGrabberSuggestsTime", 1)) |
| 264 | if (grabberSupportsNextTime) |
275 | 265 | { |
276 | 266 | QDateTime nextRun = MythDate::fromString( |
277 | 267 | gCoreContext->GetSetting("MythFillSuggestedRunTime", |
… |
… |
void HouseKeeper::RunHouseKeeping(void) |
283 | 273 | (lastRun.secsTo(now) > (3 * 60 * 60))) |
284 | 274 | runMythFill = true; |
285 | 275 | } |
286 | | else if (wantToRun("MythFillDB", period, minhr, maxhr, |
287 | | initialRun)) |
| 276 | else |
288 | 277 | { |
289 | | runMythFill = true; |
| 278 | QDate date = QDate::currentDate(); |
| 279 | int minhr = gCoreContext->GetNumSetting( |
| 280 | "MythFillMinHour", -1) % 24; |
| 281 | int maxhr = (minhr != -1) ? 23 : |
| 282 | gCoreContext->GetNumSetting( |
| 283 | "MythFillMaxHour", 23) % 24; |
| 284 | |
| 285 | QDateTime umin = |
| 286 | QDateTime(date, QTime(minhr,0)).toUTC(); |
| 287 | QDateTime umax = |
| 288 | QDateTime(date, QTime(maxhr,0)).toUTC(); |
| 289 | |
| 290 | if (umax == umin) |
| 291 | umax.addSecs(60*60); |
| 292 | |
| 293 | runMythFill = wantToRun( |
| 294 | "MythFillDB", 1, |
| 295 | umin.time().hour(), umax.time().hour(), |
| 296 | initialRun); |
290 | 297 | } |
291 | 298 | |
292 | 299 | if (runMythFill) |