From eea12e7bd7eea0e5f8f543781419c5865a9cf641 Mon Sep 17 00:00:00 2001 From: Mark Liversedge Date: Sat, 9 Feb 2013 13:21:12 +0000 Subject: [PATCH] Fix split manual ride SEGV If you try and split an empty/manual ride then the split wizard SEGVs. The split wizard now is only executed if the ride contains data. --- src/MainWindow.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index fa6987af2..dbaf183ed 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -2058,8 +2058,13 @@ MainWindow::revertRide() void MainWindow::splitRide() { - if (ride) (new SplitActivityWizard(this))->exec(); - else QMessageBox::critical(this, tr("Split Activity"), tr("No activity selected!")); + if (ride && ride->ride() && ride->ride()->dataPoints().count()) (new SplitActivityWizard(this))->exec(); + else { + if (!ride || !ride->ride()) + QMessageBox::critical(this, tr("Split Activity"), tr("No activity selected")); + else + QMessageBox::critical(this, tr("Split Activity"), tr("Current activity contains no data to split")); + } } void