From 1ce6901103186f3b88433f555317ca1049f5fa5c Mon Sep 17 00:00:00 2001 From: mariosmsk Date: Thu, 8 Aug 2019 15:50:19 +0300 Subject: [PATCH 1/2] fix in EN_deleteLink when pipes are deleted via deletelink it also deletes comment of last link Co-Authored-By: Pavlos Pavlou --- src/epanet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/epanet.c b/src/epanet.c index 7694b82..2d5cc13 100644 --- a/src/epanet.c +++ b/src/epanet.c @@ -3261,7 +3261,7 @@ int DLLEXPORT EN_deletelink(EN_Project p, int index, int actionCode) // Remove link's comment free(net->Link[index].Comment); - net->Link[net->Nlinks].Comment = NULL; + //net->Link[net->Nlinks].Comment = NULL; // Shift position of higher entries in Link array down one for (i = index; i <= net->Nlinks - 1; i++) From eb04559a118bb54836a1acf4c3149ddc971ff88b Mon Sep 17 00:00:00 2001 From: mariosmsk Date: Sat, 10 Aug 2019 11:51:21 +0300 Subject: [PATCH 2/2] rm set to null in functions EN_deletenode, EN_deletelink --- src/epanet.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/epanet.c b/src/epanet.c index 2d5cc13..687ffc1 100644 --- a/src/epanet.c +++ b/src/epanet.c @@ -1892,11 +1892,6 @@ int DLLEXPORT EN_deletenode(EN_Project p, int index, int actionCode) hashtable_update(net->NodeHashTable, net->Node[i].ID, i); } - // Remove references to demands & source in last (inactive) Node array entry - net->Node[net->Nnodes].D = NULL; - net->Node[net->Nnodes].S = NULL; - net->Node[net->Nnodes].Comment = NULL; - // If deleted node is a tank, remove it from the Tank array if (nodeType != EN_JUNCTION) { @@ -3261,7 +3256,6 @@ int DLLEXPORT EN_deletelink(EN_Project p, int index, int actionCode) // Remove link's comment free(net->Link[index].Comment); - //net->Link[net->Nlinks].Comment = NULL; // Shift position of higher entries in Link array down one for (i = index; i <= net->Nlinks - 1; i++)