Merge pull request #99 from yaacov/check-transactions

Check transactions
yaacov · Apr 26, 2017 · f91aa13 · f91aa13
2 parents 9048c67 + a8eb9b4
commit f91aa13
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -138,7 +138,9 @@ function _writeBufferToPort(buffer) {
     var transaction = this._transactions[this._transactionId];
 
     this._port.write(buffer);
-    transaction._timeoutHandle = _startTimeout(this._timeout, transaction.next);
+    if (transaction) {
+        transaction._timeoutHandle = _startTimeout(this._timeout, transaction.next);
+    }
 }
 
 /**
@@ -216,8 +218,10 @@ ModbusRTU.prototype.open = function(callback) {
                 var transaction = modbus._transactions[modbus._transactionId];
 
                 /* cancel the timeout */
-                _cancelTimeout(transaction._timeoutHandle);
-                transaction._timeoutHandle = undefined;
+                if (transaction) {
+                    _cancelTimeout(transaction._timeoutHandle);
+                    transaction._timeoutHandle = undefined;
+                }
 
                 /* check incoming data
                  */