From be13ad98bac7ca4dbc11dd666f65d98f8ab95203 Mon Sep 17 00:00:00 2001
From: Mark Watkins <jedimark@users.sourceforge.net>
Date: Fri, 8 Aug 2014 08:47:34 +1000
Subject: [PATCH] Fix crash on windows reloading day out of thread

---
 sleepyhead/daily.cpp     |  7 ++++++-
 sleepyhead/daily.h       |  1 +
 sleepyhead/mainwindow.ui | 16 ++++++++--------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sleepyhead/daily.cpp b/sleepyhead/daily.cpp
index b77d929a..6a1f0cca 100644
--- a/sleepyhead/daily.cpp
+++ b/sleepyhead/daily.cpp
@@ -776,8 +776,12 @@ void Daily::LoadDate(QDate date)
     ui->calendar->blockSignals(false);
     on_calendar_selectionChanged();
 }
-
 void Daily::on_calendar_selectionChanged()
+{
+    QTimer::singleShot(0, this, SLOT(on_ReloadDay()));
+}
+
+void Daily::on_ReloadDay()
 {
     graphView()->releaseKeyboard();
     QTime time;
@@ -1763,6 +1767,7 @@ void Daily::Unload(QDate date)
             return;
         }
     }
+
     webView->setHtml("");
     Session *journal=GetJournalSession(date);
 
diff --git a/sleepyhead/daily.h b/sleepyhead/daily.h
index 6c47a287..3968f930 100644
--- a/sleepyhead/daily.h
+++ b/sleepyhead/daily.h
@@ -145,6 +145,7 @@ public:
     void addBookmark(qint64 st, qint64 et, QString text);
 
 private slots:
+    void on_ReloadDay();
 
     /*! \fn on_calendar_currentPageChanged(int year, int month);
         \brief Scans through all days for this month, updating the day colors for the calendar object
diff --git a/sleepyhead/mainwindow.ui b/sleepyhead/mainwindow.ui
index 9d786bf3..e624d5fc 100644
--- a/sleepyhead/mainwindow.ui
+++ b/sleepyhead/mainwindow.ui
@@ -1498,7 +1498,7 @@ QToolBox::tab:selected  {
           <x>0</x>
           <y>0</y>
           <width>180</width>
-          <height>596</height>
+          <height>598</height>
          </rect>
         </property>
         <property name="palette">
@@ -1603,7 +1603,7 @@ QToolBox::tab:selected  {
           <normaloff>:/icons/bob-v3.0.png</normaloff>:/icons/bob-v3.0.png</iconset>
         </attribute>
         <attribute name="label">
-         <string>&amp;Navigation</string>
+         <string>Navigation</string>
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout_2">
          <item>
@@ -1912,7 +1912,7 @@ border: 2px solid #56789a; border-radius: 30px;
           <x>0</x>
           <y>0</y>
           <width>180</width>
-          <height>596</height>
+          <height>598</height>
          </rect>
         </property>
         <property name="palette">
@@ -1990,7 +1990,7 @@ border: 2px solid #56789a; border-radius: 30px;
           <normaloff>:/icons/bookmark.png</normaloff>:/icons/bookmark.png</iconset>
         </attribute>
         <attribute name="label">
-         <string>&amp;Bookmarks</string>
+         <string>Bookmarks</string>
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout_5">
          <property name="spacing">
@@ -3060,7 +3060,7 @@ border-radius: 10px;
           <x>0</x>
           <y>0</y>
           <width>180</width>
-          <height>596</height>
+          <height>598</height>
          </rect>
         </property>
         <property name="mouseTracking">
@@ -3074,7 +3074,7 @@ border-radius: 10px;
           <normaloff>:/icons/trophy.png</normaloff>:/icons/trophy.png</iconset>
         </attribute>
         <attribute name="label">
-         <string>&amp;Records</string>
+         <string>Records</string>
         </attribute>
         <layout class="QVBoxLayout" name="verticalLayout_6">
          <property name="spacing">
@@ -3122,7 +3122,7 @@ border-radius: 10px;
      <x>0</x>
      <y>0</y>
      <width>975</width>
-     <height>22</height>
+     <height>21</height>
     </rect>
    </property>
    <property name="sizePolicy">
@@ -3480,7 +3480,7 @@ border-radius: 10px;
   </action>
   <action name="action">
    <property name="text">
-    <string> </string>
+    <string/>
    </property>
   </action>
   <action name="actionLeft_Daily_Sidebar">