From 3f86358507e049df55ef0e1bc778cf48490d7cad Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Wed, 7 May 2014 10:10:13 +1000
Subject: [PATCH] Fix Day::hours() calculation glitch with empty sessions

---
 sleepyhead/SleepLib/day.cpp                       | 15 +++++++++++----
 .../SleepLib/loader_plugins/resmed_loader.cpp     | 13 +++++++------
 sleepyhead/SleepLib/session.h                     |  3 +++
 sleepyhead/sleepyhead.pro                         |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/sleepyhead/SleepLib/day.cpp b/sleepyhead/SleepLib/day.cpp
index c2f6c1d7..c42100b4 100644
--- a/sleepyhead/SleepLib/day.cpp
+++ b/sleepyhead/SleepLib/day.cpp
@@ -383,20 +383,27 @@ qint64 Day::total_time()
 
     // Remember sessions may overlap..
 
+    qint64 first, last;
     QList<Session *>::iterator end = sessions.end();
     for (QList<Session *>::iterator it = sessions.begin(); it != end; ++it) {
         Session &sess = *(*it);
 
         if (sess.enabled()) {
-            range.insert(sess.first(), 0);
-            range.insert(sess.last(), 1);
-            d_totaltime += sess.length();
+            first = sess.first();
+            last = sess.last();
+
+            // This algorithm relies on non zero length, and correctly ordered sessions
+            if (last > first) {
+                range.insert(first, 0);
+                range.insert(last, 1);
+                d_totaltime += sess.length();
+            }
         }
     }
 
-    qint64 ti = 0;
     bool b;
     int nest = 0;
+    qint64 ti = 0;
     qint64 total = 0;
 
     // This is my implementation of a typical "brace counting" algorithm mentioned here:
diff --git a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
index 86889986..a58b13b8 100644
--- a/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
+++ b/sleepyhead/SleepLib/loader_plugins/resmed_loader.cpp
@@ -1582,13 +1582,14 @@ int ResmedLoader::Open(QString &path, Profile *profile)
             // Add the session to the machine & profile objects
             //if (!dodgy)
 
-            if (sess->length() > 0) {
+            // FIXME: Deliberately broken, uncomment
+//            if (sess->length() > 0) {
                 m->AddSession(sess, profile);
-            } else {
-                // Hmm.. this means a ton of these could slow down import.
-                // I could instead set these to disabled by default, or implement a dodgy session marker
-                delete sess;
-            }
+//            } else {
+//                // Hmm.. this means a ton of these could slow down import.
+//                // I could instead set these to disabled by default, or implement a dodgy session marker
+//                delete sess;
+//            }
         }
     }
 
diff --git a/sleepyhead/SleepLib/session.h b/sleepyhead/SleepLib/session.h
index 229921c2..fc547fd3 100644
--- a/sleepyhead/SleepLib/session.h
+++ b/sleepyhead/SleepLib/session.h
@@ -61,6 +61,9 @@ class Session
     //! \brief Put the events away until needed again, freeing memory
     void TrashEvents();
 
+    //! \brief Returns true if session contains an empty duration
+    inline bool isEmpty() { return (s_first == s_last); }
+
     //! \brief Search for Event code happening within dist milliseconds of supplied time (ms since epoch)
     bool SearchEvent(ChannelID code, qint64 time, qint64 dist = 15000);
 
diff --git a/sleepyhead/sleepyhead.pro b/sleepyhead/sleepyhead.pro
index d1332ccd..e3a47877 100644
--- a/sleepyhead/sleepyhead.pro
+++ b/sleepyhead/sleepyhead.pro
@@ -56,7 +56,7 @@ unix:!macx {
 }
 
 macx {
-  QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
+#  QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6.8
 
   LIBS             += -lz
   ICON              = icons/iconfile.icns