From 0aea7bdb5c67e7dde3be31cfd1a8d48b72c5d322 Mon Sep 17 00:00:00 2001
From: Arjen Hiemstra <ahiemstra@heimr.nl>
Date: Fri, 10 Jun 2016 14:54:21 +0200
Subject: [PATCH] Use callLater to set the active machine in MachineManager

This prevents exceptions in setActiveMachine from preventing Cura to
start.
---
 cura/MachineManagerModel.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cura/MachineManagerModel.py b/cura/MachineManagerModel.py
index 0e7230fb79..86b044ae84 100644
--- a/cura/MachineManagerModel.py
+++ b/cura/MachineManagerModel.py
@@ -38,8 +38,7 @@ class MachineManagerModel(QObject):
 
         if active_machine_id != "":
             # An active machine was saved, so restore it.
-            self.setActiveMachine(active_machine_id)
-            pass
+            Application.getInstance().callLater(self.setActiveMachine, active_machine_id)
 
     globalContainerChanged = pyqtSignal()
     activeMaterialChanged = pyqtSignal()