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

Fix minor PRS1 regression introduced in 8fd2840.

Browse Source 
Complete failures were incorrectly being treated as fully up to date.
This commit is contained in:
sawinglogz 2021-11-03 16:06:54 -04:00
parent 1f3f33c45a
commit 48130243ed
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
oscar/SleepLib/loader_plugins/prs1_loader.cpp
View File

@ -779,17 +779,24 @@ int PRS1Loader::Open(const QString & selectedPath)
// TODO: Loaders should return the set of machines during detection, so that Open() will // TODO: Loaders should return the set of machines during detection, so that Open() will
// open a unique device, instead of surprising the user. // open a unique device, instead of surprising the user.
int c = 0; int c = 0;
bool failures = false;
for (auto & machinePath : machines) { for (auto & machinePath : machines) {
if (m_ctx == nullptr) { if (m_ctx == nullptr) {
qWarning() << "PRS1Loader::Open() called without a valid m_ctx object present"; qWarning() << "PRS1Loader::Open() called without a valid m_ctx object present";
return 0; return 0;
} }
int imported = OpenMachine(machinePath); int imported = OpenMachine(machinePath);
if (imported > 0) { // don't let errors < 0 suppress subsequent successes if (imported >= 0) { // don't let errors < 0 suppress subsequent successes
c += imported; c += imported;
} else {
failures = true;
} }
m_ctx->FlushUnexpectedMessages(); m_ctx->FlushUnexpectedMessages();
} }
if (c == 0 && failures) {
// report an error when there were failures and no successess
c = -1;
}
return c; return c;
} }