Merge branch 'dev' into lrossman-dev

2018-11-07 23:19:16 -05:00
parent 7443cea9d4 bdd67a9ae1
commit 6397a01363
4 changed files with 83 additions and 36 deletions
--- a/src/epanet.c
+++ b/src/epanet.c
@@ -3209,6 +3209,9 @@ int DLLEXPORT EN_setlinknodes(EN_ProjectHandle ph, int index, int node1, int nod
    int type;
    EN_Project *p = (EN_Project*)ph;
    EN_Network *net = &p->network;
+
+    // Check that end and start nodes are not the same
+    if (node1 == node2) return set_error(p->error_handle, 222);
    
    // Check that nodes exist
    if (node1 < 0 || node1 > net->Nnodes) return set_error(p->error_handle, 203);