Merge 3d32fdb into fc8f4ce

prestonp · Jul 14, 2016 · 8d24373 · 8d24373
2 parents fc8f4ce + 3d32fdb
commit 8d24373
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/rcon.js b/lib/rcon.js
@@ -74,7 +74,11 @@ var Rcon = function(options) {
   this.host = options.host || '127.0.0.1';
   this.port = options.port || '27015';
   this.password = options.password;
-  this.timeout = options.timeout || 5000;
+
+  if (typeof options.timeout == 'number')
+    this.timeout = options.timeout;
+  else
+    this.timeout = 5000;
 
 
   //