aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--qt-ui/addweightsystemdialog.cpp1
-rw-r--r--qt-ui/maintab.cpp10
2 files changed, 6 insertions, 5 deletions
diff --git a/qt-ui/addweightsystemdialog.cpp b/qt-ui/addweightsystemdialog.cpp
index 6ac1c02f9..48a399de9 100644
--- a/qt-ui/addweightsystemdialog.cpp
+++ b/qt-ui/addweightsystemdialog.cpp
@@ -14,6 +14,7 @@
AddWeightsystemDialog::AddWeightsystemDialog(QWidget *parent) : ui(new Ui::AddWeightsystemDialog())
{
ui->setupUi(this);
+ currentWeightsystem = NULL;
}
void AddWeightsystemDialog::setWeightsystem(weightsystem_t *ws)
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp
index f26a72a8a..2467dd0d7 100644
--- a/qt-ui/maintab.cpp
+++ b/qt-ui/maintab.cpp
@@ -93,17 +93,17 @@ void MainTab::on_addWeight_clicked()
return;
AddWeightsystemDialog dialog(this);
- weightsystem_t *newWeightsystem = (weightsystem_t *) malloc(sizeof(weightsystem_t));
- newWeightsystem->description = "";
- newWeightsystem->weight.grams = 0;
+ weightsystem_t newWeightsystem;
+ newWeightsystem.description = "";
+ newWeightsystem.weight.grams = 0;
- dialog.setWeightsystem(newWeightsystem);
+ dialog.setWeightsystem(&newWeightsystem);
int result = dialog.exec();
if (result == QDialog::Rejected)
return;
dialog.updateWeightsystem();
- weightModel->add(newWeightsystem);
+ weightModel->add(&newWeightsystem);
}
void MainTab::on_editWeight_clicked()