From 462b68f389239f00dfb01f2bb083a0a795def72e Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Wed, 22 Apr 2015 14:24:01 +0200
Subject: [PATCH] Fix issues caused by merge

---
 CuraEngineBackend.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CuraEngineBackend.py b/CuraEngineBackend.py
index 801940f1d6..68a2914d6a 100644
--- a/CuraEngineBackend.py
+++ b/CuraEngineBackend.py
@@ -39,7 +39,7 @@ class CuraEngineBackend(Backend):
         self._change_timer = QTimer()
         self._change_timer.setInterval(500)
         self._change_timer.setSingleShot(True)
-        self._change_timer.timeout.connect(self._onChangeTimerFinished)
+        self._change_timer.timeout.connect(self.slice)
 
         self._message_handlers[Cura_pb2.SlicedObjectList] = self._onSlicedObjectListMessage
         self._message_handlers[Cura_pb2.Progress] = self._onProgressMessage
@@ -213,7 +213,7 @@ class CuraEngineBackend(Backend):
         if not self._settings:
             return
 
-        self._changeTimer.start()
+        self._change_timer.start()
 
     ## TODO: Neith settings need to be moved to their own backend.
     def _sendSettings(self, settings):