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

ResMed crash fix - Not a good idea to remove sessions while iterating through them

Browse Source
This commit is contained in:
Mark Watkins 2018-05-31 10:27:44 +10:00
parent a3b5026fd7
commit b8475ac970
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sleepyhead/SleepLib/day.cpp
View File

@ -1293,6 +1293,7 @@ qint64 Day::last(MachineType type)
bool Day::removeSession(Session *sess) bool Day::removeSession(Session *sess)
{ {
sess->machine()->sessionlist.remove(sess->session());
MachineType mt = sess->type(); MachineType mt = sess->type();
bool b = sessions.removeAll(sess) > 0; bool b = sessions.removeAll(sess) > 0;
if (!searchMachine(mt)) { if (!searchMachine(mt)) {

16
sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
View File

@ -1547,9 +1547,9 @@ struct OverlappingEDF {
void ResDayTask::run() void ResDayTask::run()
{ {
if (this->resday->date == QDate(2016,1,6)) { // if (this->resday->date == QDate(2016,1,6)) {
qDebug() << "in resday" << this->resday->date; // qDebug() << "in resday" << this->resday->date;
} // }
/*loader->sessionMutex.lock(); /*loader->sessionMutex.lock();
Day *day = p_profile->FindDay(resday->date, MT_CPAP); Day *day = p_profile->FindDay(resday->date, MT_CPAP);
if (day) { if (day) {
@ -2192,12 +2192,10 @@ int ResmedLoader::Open(const QString & dirpath)
// but the worst case scenario is this session is deleted and reimported.. this just slows things down a bit in that case // but the worst case scenario is this session is deleted and reimported.. this just slows things down a bit in that case
// This day was first imported as a summary from STR.edf, so we now totally want to redo this day // This day was first imported as a summary from STR.edf, so we now totally want to redo this day
for (auto & sess : day->sessions) { QList<Session *> sessions = day->getSessions(MT_CPAP);
if (sess->type() == MT_CPAP) { for (auto & sess : sessions) {
day->removeSession(sess); day->removeSession(sess);
mach->sessionlist.remove(sess->session()); delete sess;
delete sess;
}
} }
reimporting = true; reimporting = true;