From dac961d981d3fc946d5332c2184c0275599b90b4 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Sat, 11 Oct 2014 10:44:30 +1000
Subject: [PATCH] Fix change folder restart crash, added tooltip on session
 switches

---
 sleepyhead/daily.cpp      | 6 +++---
 sleepyhead/mainwindow.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index 69f7f7f9..f88672dd 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -942,12 +942,12 @@ QString Daily::getSessionInformation(Day * day)
             int s1=len % 60;
 
             Session *sess=*s;
-            bool b=sess->enabled();
 
+            QString tooltip = QObject::tr("Click to %1 this session.").arg(sess->enabled() ? QObject::tr("disable") : QObject::tr("enable"));
             html+=QString("<tr class='datarow2'><td colspan=5 align=center>%2</td></tr>"
                           "<tr class='datarow2'>"
                           "<td width=26><a href='toggle"+type+"session=%1'>"
-                          "<img src='qrc:/icons/session-%4.png' width=24px></a></td>"
+                          "<img src='qrc:/icons/session-%4.png' width=24px title=\""+tooltip+"\"></a></td>"
                           "<td align=left>%5</td>"
                           "<td align=left>%6</td>"
                           "<td align=left>%7</td>"
@@ -956,7 +956,7 @@ QString Daily::getSessionInformation(Day * day)
                     .arg((*s)->session())
                     .arg(QObject::tr("%1 Session #%2").arg((*s)->machine()->loaderName()).arg((*s)->session(),8,10,QChar('0')))
                     .arg(QString("%1h %2m %3s").arg(h,2,10,QChar('0')).arg(m,2,10,QChar('0')).arg(s1,2,10,QChar('0')))
-                    .arg((b ? "on" : "off"))
+                    .arg((sess->enabled() ? "on" : "off"))
                     .arg(fd.date().toString(Qt::SystemLocaleShortDate))
                     .arg(fd.toString("HH:mm:ss"))
                     .arg(ld.toString("HH:mm:ss"));
diff --git a/sleepyhead/mainwindow.cpp b/sleepyhead/mainwindow.cpp
index 754c76db..1b5e136d 100644
--- a/sleepyhead/mainwindow.cpp
+++ b/sleepyhead/mainwindow.cpp
@@ -1918,7 +1918,7 @@ void MainWindow::on_action_Rebuild_Oximetry_Index_triggered()
 
 void MainWindow::RestartApplication(bool force_login, QString cmdline)
 {
-    p_profile->removeLock();
+    if (p_profile) p_profile->removeLock();
 
     QString apppath;
 #ifdef Q_OS_MAC