From 6c8d9d67513fb034a450c00233d02cbfcf1caef1 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Mon, 5 Oct 2020 18:29:01 -0700 Subject: [PATCH] Fix two issues in ResMed loader: 1) If data compression option is set, loader will now try the str.edf.gz file first, with fallback to str.edf 2) Mixed Windows and Unix separators are now allowed in --datadir, which was previously causing data loss when rebuilding CPAP data. --- oscar/SleepLib/loader_plugins/resmed_loader.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/oscar/SleepLib/loader_plugins/resmed_loader.cpp b/oscar/SleepLib/loader_plugins/resmed_loader.cpp index bd5cca3c..716e5fbd 100644 --- a/oscar/SleepLib/loader_plugins/resmed_loader.cpp +++ b/oscar/SleepLib/loader_plugins/resmed_loader.cpp @@ -375,6 +375,8 @@ int ResmedLoader::Open(const QString & dirpath) QString backup_path = mach->getBackupPath(); + // Compare QDirs rather than QStrings because separators may be different, especially on Windows. + // We want to check whether import and backup paths are the same, regardless of variations in the string representations. QDir ipath(importPath); QDir bpath(backup_path); @@ -1034,6 +1036,7 @@ QString ResmedLoader::Backup(const QString & fullname, const QString & backup_pa // First make sure the correct backup exists in the right place // Allow for second import of newer version of EVE and CSL edf files // But don't try to copy onto itself (as when rebuilding CPAP data from backup) + // Compare QDirs rather than QStrings to handle variations in separators, etc. QFile nf(newname); QFile of(fullname);