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 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 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();