mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-11-02 20:52:20 -07:00
Merge branch 'smartavionics-mb-fix-simulation-view-race'
This commit is contained in:
commit
53b3efb9b8
1 changed files with 3 additions and 5 deletions
|
|
@ -61,7 +61,9 @@ class ProcessSlicedLayersJob(Job):
|
||||||
|
|
||||||
def run(self):
|
def run(self):
|
||||||
start_time = time()
|
start_time = time()
|
||||||
if Application.getInstance().getController().getActiveView().getPluginId() == "SimulationView":
|
view = Application.getInstance().getController().getActiveView()
|
||||||
|
if view.getPluginId() == "SimulationView":
|
||||||
|
view.resetLayerData()
|
||||||
self._progress_message.show()
|
self._progress_message.show()
|
||||||
Job.yieldThread()
|
Job.yieldThread()
|
||||||
if self._abort_requested:
|
if self._abort_requested:
|
||||||
|
|
@ -226,10 +228,6 @@ class ProcessSlicedLayersJob(Job):
|
||||||
if self._progress_message:
|
if self._progress_message:
|
||||||
self._progress_message.setProgress(100)
|
self._progress_message.setProgress(100)
|
||||||
|
|
||||||
view = Application.getInstance().getController().getActiveView()
|
|
||||||
if view.getPluginId() == "SimulationView":
|
|
||||||
view.resetLayerData()
|
|
||||||
|
|
||||||
if self._progress_message:
|
if self._progress_message:
|
||||||
self._progress_message.hide()
|
self._progress_message.hide()
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue