mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't add cylinders and weightsystems past the MAX

Browse source 
We actually should disable the 'Add' button, I guess.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-01 14:49:17 -07:00
parent 04e59a0e1c
commit 482bea84c2
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
qt-ui/maintab.cpp
View file

@ -61,6 +61,9 @@ void MainTab::clearStats()
void MainTab::on_addCylinder_clicked() void MainTab::on_addCylinder_clicked()
{ {
if (cylindersModel->rowCount() >= MAX_CYLINDERS)
return;
AddCylinderDialog dialog(this); AddCylinderDialog dialog(this);
cylinder_t *newCylinder = (cylinder_t*) malloc(sizeof(cylinder_t)); cylinder_t *newCylinder = (cylinder_t*) malloc(sizeof(cylinder_t));
newCylinder->type.description = ""; newCylinder->type.description = "";
@ -85,6 +88,9 @@ void MainTab::on_delCylinder_clicked()
void MainTab::on_addWeight_clicked() void MainTab::on_addWeight_clicked()
{ {
if (weightModel->rowCount() >= MAX_WEIGHTSYSTEMS)
return;
/* this needs a dialog - right now we just fill in a dummy */ /* this needs a dialog - right now we just fill in a dummy */
weightsystem_t *newWeightsystem = (weightsystem_t *) malloc(sizeof(weightsystem_t)); weightsystem_t *newWeightsystem = (weightsystem_t *) malloc(sizeof(weightsystem_t));
newWeightsystem->description = "Just testing"; newWeightsystem->description = "Just testing";

2
qt-ui/models.cpp
View file

@ -98,6 +98,7 @@ void CylindersModel::add(cylinder_t* cyl)
{ {
if (usedRows[current_dive] >= MAX_CYLINDERS) { if (usedRows[current_dive] >= MAX_CYLINDERS) {
free(cyl); free(cyl);
return;
} }
int row = usedRows[current_dive]; int row = usedRows[current_dive];
@ -203,6 +204,7 @@ void WeightModel::add(weightsystem_t* weight)
{ {
if (usedRows[current_dive] >= MAX_WEIGHTSYSTEMS) { if (usedRows[current_dive] >= MAX_WEIGHTSYSTEMS) {
free(weight); free(weight);
return;
} }
int row = usedRows[current_dive]; int row = usedRows[current_dive];