From c7fa1c408cbf4d69c1b0e0ca0e65274b1c5cf64c Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sun, 8 Jan 2012 13:29:22 +1000
Subject: [PATCH] Profile::GetDay and related fixes

---
 SleepLib/profiles.cpp | 16 ++++++++++++----
 mainwindow.cpp        |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/SleepLib/profiles.cpp b/SleepLib/profiles.cpp
index 69ce1b6c..639918c9 100644
--- a/SleepLib/profiles.cpp
+++ b/SleepLib/profiles.cpp
@@ -231,6 +231,10 @@ QDomElement Profile::ExtraSave(QDomDocument & doc)
 #include <QMessageBox>
 void Profile::AddDay(QDate date,Day *day,MachineType mt) {
     //date+=wxTimeSpan::Day();
+    if (!day)  {
+        qDebug() << "Profile::AddDay called with null day object";
+        return;
+    }
     if (is_first_day) {
         m_first=m_last=date;
         is_first_day=false;
@@ -282,17 +286,21 @@ Day * Profile::GetGoodDay(QDate date,MachineType type)
 
 Day * Profile::GetDay(QDate date,MachineType type)
 {
-    Day *day=NULL;
-    // profile->     why did I d that??
+    Day *tmp,*day=NULL;
     if (daylist.find(date)!=daylist.end()) {
         for (QList<Day *>::iterator di=daylist[date].begin();di!=daylist[date].end();di++) {
+            tmp=*di;
+            if (!tmp) {
+                qDebug() << "This should never happen in Profile::GetDay()";
+                break;
+            }
 
             if (type==MT_UNKNOWN) { // Who cares.. We just want to know there is data available.
-                day=(*di);
+                day=tmp;
                 break;
             }
             if ((*di)->machine_type()==type) {
-                day=(*di);
+                day=tmp;
                 break;
             }
         }
diff --git a/mainwindow.cpp b/mainwindow.cpp
index dfc23143..ee73bc07 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2311,7 +2311,8 @@ void MainWindow::on_actionPurge_Current_Day_triggered()
             if ((*it)==day) break;
         }
         if (it!=dl.end()) {
-            PROFILE.daylist[date].erase(it);
+            dl.erase(it);
+            //PROFILE.daylist[date].  // ??
             delete day;
         }
     }