Merge branch '2.3'

This commit is contained in:
Ghostkeeper 2016-10-31 10:55:54 +01:00
commit 6999a14821
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
7 changed files with 30 additions and 16 deletions

View file

@ -248,7 +248,6 @@ class MachineManager(QObject):
def _onActiveExtruderStackChanged(self):
self.blurSettings.emit() # Ensure no-one has focus.
old_active_container_stack = self._active_container_stack
if self._active_container_stack and self._active_container_stack != self._global_container_stack: