fly/flightgear
1
0
Fork 0
Code Activity

Fix for abandoned cache rebuild dialog

Browse source 
Sentry-Id: FLIGHTGEAR-75G
Sentry-Id: FLIGHTGEAR-860
Sentry-Id: FLIGHTGEAR-BR2
This commit is contained in:
James Turner 2021-06-11 12:56:23 +01:00
parent e23bf8d7d2
commit 6232fd7978
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/GUI/QtLauncher.cxx
View file

@ -103,7 +103,7 @@ static std::initializer_list<ProgressLabel> progressStrings = {
{NavDataCache::REBUILD_POIS, QT_TRANSLATE_NOOP("initNavCache","Loading point-of-interest data")}
};
void initNavCache()
bool initNavCache()
{
const char* baseLabelKey = QT_TRANSLATE_NOOP("initNavCache", "Initialising navigation data, this may take several minutes");
QString baseLabel= qApp->translate("initNavCache", baseLabelKey);
@ -127,10 +127,12 @@ void initNavCache()
QTimer updateTimer;
updateTimer.setInterval(500);
bool rebuildIsDone = false;
QObject::connect(&updateTimer, &QTimer::timeout, [&waitForRebuild]() {
QObject::connect(&updateTimer, &QTimer::timeout, [&waitForRebuild, &rebuildIsDone]() {
if (!NavDataCache::isAnotherProcessRebuilding()) {
waitForRebuild.done(0);
rebuildIsDone = true;
return;
}
});
@ -138,6 +140,12 @@ void initNavCache()
updateTimer.start(); // timer won't actually run until we process events
waitForRebuild.exec();
updateTimer.stop();
if (!rebuildIsDone) {
flightgear::addSentryBreadcrumb("Launcher wait on other process nav-cache rebuild abandoned by user", "info");
return false;
}
addSentryBreadcrumb("Launcher: done waiting for other process NavCache rebuild dialog", "info");
}
@ -156,10 +164,13 @@ void initNavCache()
QTimer updateTimer;
updateTimer.setInterval(100);
QObject::connect(&updateTimer, &QTimer::timeout, [&cache, &rebuildProgress, &baseLabel]() {
bool didComplete = false;
QObject::connect(&updateTimer, &QTimer::timeout, [&cache, &rebuildProgress, &baseLabel, &didComplete]() {
auto phase = cache->rebuild();
if (phase == NavDataCache::REBUILD_DONE) {
rebuildProgress.done(0);
didComplete = true;
return;
}
@ -180,12 +191,20 @@ void initNavCache()
rebuildProgress.setMaximum(100);
}
});
updateTimer.start(); // timer won't actually run until we process events
rebuildProgress.exec();
updateTimer.stop();
if (!didComplete) {
flightgear::addSentryBreadcrumb("Launcher nav-cache rebuild abandoned by user", "info");
return false;
}
flightgear::addSentryBreadcrumb("Launcher nav-cache rebuild complete", "info");
}
return true;
}
class NaturalEarthDataLoaderThread : public QThread
@ -591,7 +610,10 @@ bool runLauncherDialog()
// startup the nav-cache now. This pre-empts normal startup of
// the cache, but no harm done. (Providing scenery paths are consistent)
initNavCache();
bool ok = initNavCache();
if (!ok) {
return false;
}
auto options = flightgear::Options::sharedInstance();
if (options->isOptionSet("download-dir")) {