From 8d766e13e258e206edb2c2746895845de942fa8e Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 14 Nov 2014 13:33:12 -0800 Subject: Make sure we always have copies of equipment descriptions Having pointers copied around that might get freed elsewhere could be a problem. Signed-off-by: Dirk Hohndel --- qt-ui/modeldelegates.cpp | 4 ++-- qt-ui/models.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index 8b70b48b3..7079173c4 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -271,7 +271,7 @@ QWidget *TankInfoDelegate::createEditor(QWidget *parent, const QStyleOptionViewI QWidget *delegate = ComboBoxDelegate::createEditor(parent, option, index); CylindersModel *mymodel = qobject_cast(currCombo.model); cylinder_t *cyl = mymodel->cylinderAt(index); - currCylinderData.type = cyl->type.description; + currCylinderData.type = copy_string(cyl->type.description); currCylinderData.pressure = cyl->type.workingpressure.mbar; currCylinderData.size = cyl->type.size.mliter; return delegate; @@ -323,7 +323,7 @@ QWidget *WSInfoDelegate::createEditor(QWidget *parent, const QStyleOptionViewIte QWidget *editor = ComboBoxDelegate::createEditor(parent, option, index); WeightModel *mymodel = qobject_cast(currCombo.model); weightsystem_t *ws = mymodel->weightSystemAt(index); - currWeight.type = ws->description; + currWeight.type = copy_string(ws->description); currWeight.weight = ws->weight.grams; return editor; } diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index e62598479..f73b1dc94 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -632,7 +632,7 @@ bool WeightModel::setData(const QModelIndex &index, const QVariant &value, int r int i = -1; while (ws_info[++i].name) { if (gettextFromC::instance()->tr(ws_info[i].name) == vString) { - ws->description = ws_info[i].name; + ws->description = copy_string(ws_info[i].name); break; } } -- cgit v1.2.3-70-g09d2