From b16933d68f3265e592b347c34b97e77ba5845977 Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Wed, 2 Sep 2015 11:10:05 +0200
Subject: [PATCH] Fix of crash caused by merge

---
 cura/CuraApplication.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
index 7841c5c462..7196d79f15 100644
--- a/cura/CuraApplication.py
+++ b/cura/CuraApplication.py
@@ -398,7 +398,7 @@ class CuraApplication(QtApplication):
 
     @pyqtSlot(str, result = "QVariant")
     def getSettingValue(self, key):
-        if not self.getActiveMachine():
+        if not self.getMachineManager().getActiveMachineInstance():
             return None
 
         return self.getActiveMachine().getSettingValueByKey(key)