nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 08:08:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RideSummaryWindow crash

Browse Source 
The recent patch to allow users to configure which
metrics to display on the ride summary window is not
forwards compatible. If metrics referenced no longer
exist (i.e. they are from a future release or have
been deprecated) GC will crash.
This commit is contained in:
Mark Liversedge
2011-08-01 23:36:49 +01:00
parent 20477e1670
commit d84ffec0a6
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/RideSummaryWindow.cpp
View File

@@ -155,24 +155,27 @@ RideSummaryWindow::htmlSummary() const
if (!symbol) break;
RideMetricPtr m = rideItem->metrics.value(symbol);
QString name = m->name().replace(QRegExp(tr("^Average ")), "");
if (m->units(metricUnits) == "seconds" || m->units(metricUnits) == tr("seconds")) {
QString s("<tr><td>%1:</td><td "
"align=\"right\">%2</td></tr>");
s = s.arg(name);
s = s.arg(time_to_string(m->value(metricUnits)));
summary += s;
}
else {
QString s = "<tr><td>" + name;
if (m->units(metricUnits) != "")
s += " (" + m->units(metricUnits) + ")";
s += ":</td><td align=\"right\">%1</td></tr>";
if (m->precision() == 0)
s = s.arg((unsigned) round(m->value(metricUnits)));
else
s = s.arg(m->value(metricUnits), 0, 'f', m->precision());
summary += s;
if (m) { // only if the metric still exists (ride metric forwards compatibility)
QString name = m->name().replace(QRegExp(tr("^Average ")), "");
if (m->units(metricUnits) == "seconds" || m->units(metricUnits) == tr("seconds")) {
QString s("<tr><td>%1:</td><td "
"align=\"right\">%2</td></tr>");
s = s.arg(name);
s = s.arg(time_to_string(m->value(metricUnits)));
summary += s;
} else {
QString s = "<tr><td>" + name;
if (m->units(metricUnits) != "")
s += " (" + m->units(metricUnits) + ")";
s += ":</td><td align=\"right\">%1</td></tr>";
if (m->precision() == 0)
s = s.arg((unsigned) round(m->value(metricUnits)));
else
s = s.arg(m->value(metricUnits), 0, 'f', m->precision());
summary += s;
}
}
}
summary += "</table></td>";