From 2ae27ed71c8c8d709abde50128c0b65faaa7a2d1 Mon Sep 17 00:00:00 2001
From: Joern <joern.rm@gmail.com>
Date: Fri, 30 May 2014 10:27:30 +0200
Subject: [PATCH] Avoid Dump in Merge Activity Wizard

... Only allow "Next" if 2nd file is loaded (otherwise a dump occurs)

(cherry picked from commit 88b8479cbb90c8306ca32c0d193199ed895db95c)
---
 src/MergeActivityWizard.cpp | 9 +++++++++
 src/MergeActivityWizard.h   | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/MergeActivityWizard.cpp b/src/MergeActivityWizard.cpp
index 1329e2061..9aa789422 100644
--- a/src/MergeActivityWizard.cpp
+++ b/src/MergeActivityWizard.cpp
@@ -159,6 +159,8 @@ 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;
+                emit completeChanged();
             }
 
         } else {
@@ -170,6 +172,13 @@ MergeUpload::importFile(QList<QString> files)
 }
 
 
+bool MergeUpload::isComplete() const
+{
+  return ride2Loaded;
+}
+
+
+
 // Synchronise start of files
 MergeSync::MergeSync(MergeActivityWizard *parent) : QWizardPage(parent), wizard(parent)
 {
diff --git a/src/MergeActivityWizard.h b/src/MergeActivityWizard.h
index 4c4d7eb2c..0d6da4f5e 100644
--- a/src/MergeActivityWizard.h
+++ b/src/MergeActivityWizard.h
@@ -146,6 +146,8 @@ class MergeUpload : public QWizardPage
 
         QPushButton *uploadButton;
         QLabel      *labelSuccess, *ride2Label;
+        bool isComplete() const;
+        bool ride2Loaded = FALSE;
 
     private slots:
         void importFile();