From 0e041ed4a94db188550e6be376c84e2a7f312c61 Mon Sep 17 00:00:00 2001
From: make-ing <bckr.florian@gmail.com>
Date: Fri, 13 Nov 2015 16:17:44 +0100
Subject: [PATCH] fixed array in array bug

---
 src/octoprint/util/comm_acc2.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/octoprint/util/comm_acc2.py b/src/octoprint/util/comm_acc2.py
index 3c4ff0de..fde3a54d 100644
--- a/src/octoprint/util/comm_acc2.py
+++ b/src/octoprint/util/comm_acc2.py
@@ -1219,12 +1219,14 @@ def get_interval(t):
 		return settings().getFloat(["serial", "timeout", t])
 
 def serialList():
-	baselist = [glob.glob("/dev/ttyUSB*"),
-				glob.glob("/dev/ttyACM*"),
-				glob.glob("/dev/tty.usb*"),
-				glob.glob("/dev/cu.*"),
-				glob.glob("/dev/cuaU*"),
-				glob.glob("/dev/rfcomm*")]
+	baselist = []
+	baselist = baselist \
+				+ glob.glob("/dev/ttyUSB*") \
+				+ glob.glob("/dev/ttyACM*") \
+				+ glob.glob("/dev/tty.usb*") \
+				+ glob.glob("/dev/cu.*") \
+				+ glob.glob("/dev/cuaU*") \
+				+ glob.glob("/dev/rfcomm*")
 
 	additionalPorts = settings().get(["serial", "additionalPorts"])
 	for additional in additionalPorts: