chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-05 18:50:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the missing import progress dialog when forcing a rebuild.

Browse Source 
Because opening a profile already had a progress dialog open, the import
process during a forced rebuild wasn't appearing, so it would look like
OSCAR was hanging for as long as the import took.

Temporarily hiding the profile progress dialog resolves the issue.
This commit is contained in:
sawinglogz 2019-12-27 22:29:18 -06:00
parent ba44887853
commit 4976d7077e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oscar/SleepLib/profiles.cpp
View File

@ -599,15 +599,18 @@ void Profile::LoadMachineData(ProgressDialog *progress)
if (loader) {
if (mach->version() < loader->Version()) {
qDebug() << "LoadMachineData data format error, machine version" << mach->version() << "loader version" << loader->Version();
progress->hide();
DataFormatError(mach);
progress->show();
} else {
try {
mach->Load(progress);
} catch (OldDBVersion& e) {
qDebug() << "LoadMachineData mach->load failure, machine version" << mach->version() << "loader version" << loader->Version();
Q_UNUSED(e)
progress->hide();
DataFormatError(mach);
progress->show();
}
}
} else {