Avoid crashes if perspective is not set

Continuation of fbae10f
GoldenCheetah · Sep 6, 2022 · 0d30d44 · 0d30d44
1 parent fbae10f
commit 0d30d44
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/src/Charts/CriticalPowerWindow.h b/src/Charts/CriticalPowerWindow.h
@@ -125,7 +125,7 @@ class CriticalPowerWindow : public GcChartWindow
         void setVariant(int x);
 
         // filter
-        bool isFiltered() const { return (searchBox->isFiltered() || myPerspective->isFiltered() || context->ishomefiltered || context->isfiltered); }
+        bool isFiltered() const { return (searchBox->isFiltered() || (myPerspective && myPerspective->isFiltered()) || context->ishomefiltered || context->isfiltered); }
         QString filter() const { return searchBox->filter(); }
         void setFilter(QString x) { searchBox->setFilter(x); }
 

diff --git a/src/Charts/HistogramWindow.cpp b/src/Charts/HistogramWindow.cpp
@@ -1032,8 +1032,8 @@ HistogramWindow::updateChart()
                 // plotting a data series, so refresh the ridefilecache
 
                 if (rangemode) {
-                    source = new RideFileCache(context, use.from, use.to, isfiltered||myPerspective->isFiltered(),
-                                                                          files + myPerspective->filterlist(use), rangemode);
+                    source = new RideFileCache(context, use.from, use.to, isfiltered || (myPerspective && myPerspective->isFiltered()),
+                                               files + (myPerspective ? myPerspective->filterlist(use) : QStringList()), rangemode);
                 } else source = new RideFileCache(context, use.from, use.to, isfiltered, files, rangemode);
 
                 cfrom = use.from;
@@ -1071,7 +1071,7 @@ HistogramWindow::updateChart()
                 fs.addFilter(isfiltered, files);
                 fs.addFilter(context->isfiltered, context->filters);
                 fs.addFilter(context->ishomefiltered, context->homeFilters);
-                fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(use));
+                if (myPerspective) fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(use));
 
                 // setData using the summary metrics -- always reset since filters may
                 // have changed, or perhaps the bin width...

diff --git a/src/Charts/LTMWindow.cpp b/src/Charts/LTMWindow.cpp
@@ -637,7 +637,7 @@ LTMWindow::presetSelected(int index)
         fs.addFilter(context->isfiltered, context->filters);
         fs.addFilter(context->ishomefiltered, context->homeFilters);
         fs.addFilter(ltmTool->isFiltered(), ltmTool->filters());
-        fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(myDateRange));
+        if (myPerspective) fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(myDateRange));
         settings.specification.setFilterSet(fs);
         settings.specification.setDateRange(DateRange(settings.start.date(), settings.end.date()));
 
@@ -1075,7 +1075,7 @@ LTMWindow::filterChanged()
     fs.addFilter(context->isfiltered, context->filters);
     fs.addFilter(context->ishomefiltered, context->homeFilters);
     fs.addFilter(ltmTool->isFiltered(), ltmTool->filters());
-    fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(myDateRange));
+    if (myPerspective) fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(myDateRange));
     settings.specification.setFilterSet(fs);
     settings.specification.setDateRange(DateRange(settings.start.date(), settings.end.date()));
 
@@ -1202,7 +1202,7 @@ LTMWindow::applyClicked()
         fs.addFilter(context->isfiltered, context->filters);
         fs.addFilter(context->ishomefiltered, context->homeFilters);
         fs.addFilter(ltmTool->isFiltered(), ltmTool->filters());
-        fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(myDateRange));
+        if (myPerspective) fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(myDateRange));
         settings.specification.setFilterSet(fs);
         settings.specification.setDateRange(DateRange(settings.start.date(), settings.end.date()));
 

diff --git a/src/Charts/TreeMapWindow.cpp b/src/Charts/TreeMapWindow.cpp
@@ -250,7 +250,7 @@ TreeMapWindow::refresh()
         FilterSet fs;
         fs.addFilter(context->isfiltered, context->filters);
         fs.addFilter(context->ishomefiltered, context->homeFilters);
-        fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(dr));
+        if (myPerspective) fs.addFilter(myPerspective->isFiltered(), myPerspective->filterlist(dr));
         settings.specification.setFilterSet(fs);
         settings.specification.setDateRange(dr);
 

diff --git a/src/Charts/UserChartData.cpp b/src/Charts/UserChartData.cpp
@@ -80,7 +80,7 @@ UserChartData::compute(RideItem *item, Specification spec, DateRange dr)
             FilterSet fs;
             fs.addFilter(context->isfiltered, context->filters);
             fs.addFilter(context->ishomefiltered, context->homeFilters);
-            fs.addFilter(rt->chart->myPerspective->isFiltered(), rt->chart->myPerspective->filterlist(dr));
+            if (rt->chart->myPerspective) fs.addFilter(rt->chart->myPerspective->isFiltered(), rt->chart->myPerspective->filterlist(dr));
             spec.setFilterSet(fs);
 
             // loop through rides for daterange