From: daid <daid303@gmail.com>
Date: Mon, 17 Feb 2014 09:46:22 +0000 (+0100)
Subject: Fixed #729 - Use the name from the connect.doodle.com api if that one is available.
X-Git-Tag: 14.02-RC2~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e6d72a7d832e578426f098ef05fb6691048a163f;p=cura.git

Fixed #729 - Use the name from the connect.doodle.com api if that one is available.
---

diff --git a/Cura/util/printerConnection/doodle3dConnect.py b/Cura/util/printerConnection/doodle3dConnect.py
index ec2f5534..f6e28ce8 100644
--- a/Cura/util/printerConnection/doodle3dConnect.py
+++ b/Cura/util/printerConnection/doodle3dConnect.py
@@ -60,7 +60,10 @@ class doodle3dConnectionGroup(printerConnectionBase.printerConnectionGroup):
 				if possiblePrinter['localip'] not in self._connectionMap:
 					status = self._request('GET', '/d3dapi/config/?network.cl.wifiboxid=', host=possiblePrinter['localip'])
 					if status and 'data' in status and 'network.cl.wifiboxid' in status['data']:
-						self._connectionMap[possiblePrinter['localip']] = doodle3dConnect(possiblePrinter['localip'], status['data']['network.cl.wifiboxid'], self)
+						name = status['data']['network.cl.wifiboxid']
+						if 'wifiboxid' in possiblePrinter:
+							name = possiblePrinter['wifiboxid']
+						self._connectionMap[possiblePrinter['localip']] = doodle3dConnect(possiblePrinter['localip'], name, self)
 
 			# Delay a bit more after every request. This so we do not stress the connect.doodle3d.com api too much
 			if self._waitDelay < 10: