Merge branch 'master' into CURA-8510_version_upgrade

This commit is contained in:
Konstantinos Karmas 2021-09-23 17:01:00 +02:00
commit ad6a8d828e
44 changed files with 670 additions and 135 deletions

View file

@ -320,7 +320,7 @@ class CuraApplication(QtApplication):
super().initialize()
self._preferences.addPreference("cura/single_instance", False)
self._use_single_instance = self._preferences.getValue("cura/single_instance")
self._use_single_instance = self._preferences.getValue("cura/single_instance") or self._cli_args.single_instance
self.__sendCommandToSingleInstance()
self._initializeSettingDefinitions()