From 3607f1833be3db3545bf0fdd84098f790dca1f48 Mon Sep 17 00:00:00 2001
From: Mark Liversedge <liversedge@gmail.com>
Date: Fri, 30 May 2014 10:24:24 +0100
Subject: [PATCH] Fixup Fix for MergeActivityWizard crash

.. TRUE/FALSE are case sensitive on Mac
.. ride2Loaded renamed ridesLoaded
.. ridesLoaded initialisation moved to constructor

Thanks to Jorn for the fix to a P0 bug !
---
 src/MergeActivityWizard.cpp | 8 +++-----
 src/MergeActivityWizard.h   | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/MergeActivityWizard.cpp b/src/MergeActivityWizard.cpp
index 9aa789422..0ac020f73 100644
--- a/src/MergeActivityWizard.cpp
+++ b/src/MergeActivityWizard.cpp
@@ -72,7 +72,7 @@ MergeWelcome::MergeWelcome(MergeActivityWizard *parent) : QWizardPage(parent), w
 }
 
 // Upload
-MergeUpload::MergeUpload(MergeActivityWizard *parent) : QWizardPage(parent), wizard(parent)
+MergeUpload::MergeUpload(MergeActivityWizard *parent) : QWizardPage(parent), wizard(parent), ridesLoaded(false)
 {
     setTitle(tr("Upload"));
     setSubTitle(tr("Select file to merge"));
@@ -132,8 +132,6 @@ MergeUpload::importFile()
 void
 MergeUpload::importFile(QList<QString> files)
 {
-
-
     // get fullpath name for processing
     QFileInfo filename = QFileInfo(files[0]).absoluteFilePath();
 
@@ -159,7 +157,7 @@ MergeUpload::importFile(QList<QString> files)
                 ride2Label->setText(tr("Second ride")+" "+ride->startTime().toString(tr("MMM d, yyyy - hh:mm:ss")));
 
                 wizard->ride2 = ride;
-                ride2Loaded = TRUE;
+                ridesLoaded = true;
                 emit completeChanged();
             }
 
@@ -174,7 +172,7 @@ MergeUpload::importFile(QList<QString> files)
 
 bool MergeUpload::isComplete() const
 {
-  return ride2Loaded;
+  return ridesLoaded;
 }
 
 
diff --git a/src/MergeActivityWizard.h b/src/MergeActivityWizard.h
index 0d6da4f5e..ac5f6a36d 100644
--- a/src/MergeActivityWizard.h
+++ b/src/MergeActivityWizard.h
@@ -147,7 +147,7 @@ class MergeUpload : public QWizardPage
         QPushButton *uploadButton;
         QLabel      *labelSuccess, *ride2Label;
         bool isComplete() const;
-        bool ride2Loaded = FALSE;
+        bool ridesLoaded;
 
     private slots:
         void importFile();