From 925bb019c716ce5244765e54f1de584ece340b23 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 6 Jan 2015 20:27:49 -0800 Subject: Fix potential crash Commits 0de3bc845237 ("Display CCR setpoint values on the po2 graph") and 65eed80e3730 ("Don't always show the setpoint graph") didn't take into account that current_dive could be NULL and therefore accessing current_dc could crash. Signed-off-by: Dirk Hohndel --- qt-ui/profile/profilewidget2.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt-ui/profile/profilewidget2.cpp b/qt-ui/profile/profilewidget2.cpp index f17575d67..226580a48 100644 --- a/qt-ui/profile/profilewidget2.cpp +++ b/qt-ui/profile/profilewidget2.cpp @@ -531,7 +531,7 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) currentdc = fake_dc(currentdc); } - if ((current_dc->dctype == CCR) && (prefs.show_ccr_setpoint)) + if (current_dive && (currentdc->dctype == CCR) && (prefs.show_ccr_setpoint)) o2SetpointGasItem->setVisible(true); else o2SetpointGasItem->setVisible(false); @@ -991,7 +991,7 @@ void ProfileWidget2::setProfileState() } pn2GasItem->setVisible(prefs.pp_graphs.pn2); po2GasItem->setVisible(prefs.pp_graphs.po2); - o2SetpointGasItem->setVisible((current_dc->dctype == CCR) && (prefs.show_ccr_setpoint)); + o2SetpointGasItem->setVisible(current_dive && (current_dc->dctype == CCR) && (prefs.show_ccr_setpoint)); pheGasItem->setVisible(prefs.pp_graphs.phe); timeAxis->setPos(itemPos.time.pos.on); -- cgit v1.2.3-70-g09d2