From 5a64262ff6d4fcef583717798f760a919a33f7e1 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Tue, 13 Apr 2021 17:48:39 -0600
Subject: [PATCH] Minor fix to #ifdefs in DV6 loader

---
 oscar/SleepLib/loader_plugins/intellipap_loader.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
index c40357ff..4a5a4717 100644
--- a/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
+++ b/oscar/SleepLib/loader_plugins/intellipap_loader.cpp
@@ -923,12 +923,14 @@ private:
 
     int numWritten;     // Number of records written
     quint32 lastTimestamp;
+    unsigned int wrap_record;
 };
 
 bool RollingBackup::open (const QString filetype, DV6_HEADER * newhdr) {
     if (!create_backups)
         return true;
 
+#ifdef ROLLBACKUP
     this->filetype = filetype;
 
     QDir hpath(history_path);
@@ -971,17 +973,20 @@ bool RollingBackup::open (const QString filetype, DV6_HEADER * newhdr) {
             }
             record_length = hdr.recordLength;
 
-#ifdef ROLLBACKUP
             wrap_record = convertNum(hdr.recordStart);
             if (!histfile.seek(sizeof(DV6_HEADER) + (wrap_record-1) * record_length)) {
-                qWarning() << "DV6 RollingBackup unable to make initial seek to record" << wrap_record << "in" + filename << file.error() << file.errorString();
-                file.close();
+                qWarning() << "DV6 RollingBackup unable to make initial seek to record" << wrap_record
+                           << "in" + histfile.fileName() << histfile.error() << histfile.errorString();
+                histfile.close();
                 return false;
             }
-#endif
 
         }
     }
+#else
+    Q_UNUSED(filetype)
+    Q_UNUSED(newhdr)
+#endif
 
     return true;
 }