From 4976d7077e17e23563cd9e419146c1a5a34da683 Mon Sep 17 00:00:00 2001 From: sawinglogz <3787776-sawinglogz@users.noreply.gitlab.com> Date: Fri, 27 Dec 2019 22:29:18 -0600 Subject: [PATCH] Fix the missing import progress dialog when forcing a rebuild. 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. --- oscar/SleepLib/profiles.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index 8ae04efa..25f651fb 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -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 {