From 3d26b6886fef2bfdf485cf5e6676728f0f30c8a3 Mon Sep 17 00:00:00 2001 From: Kostas Karmas Date: Wed, 22 Apr 2020 18:22:42 +0200 Subject: [PATCH] Fix the welcome dialog not closing when cloud printers detected The welcome dialog was not closing because when pressing the "Sign up" button in the cloud page, a signal is emitted that is forcing the welcome wizard to move to the next page. Therefore the currentPageIdx was detected as cloud_page_idx+1. This commit fixes the check by checking whether the welcome dialog is in the page after the Cloud page. CURA-7019 --- .../src/Cloud/CloudOutputDeviceManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index c5c583dcf7..60ec98acc0 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -104,9 +104,9 @@ class CloudOutputDeviceManager: # found, the welcome screen will close. This way we avoid prompting the user to add printers if he/she already # has cloud printers welcome_pages_model = CuraApplication.getInstance().getWelcomePagesModel() - cloud_page_idx = welcome_pages_model.getPageIndexById("cloud") - if welcome_pages_model.currentPageIndex == cloud_page_idx and online_clusters: - CuraApplication.getWelcomePagesModel().atEnd() + cloud_page_idx = welcome_pages_model.getPageIndexById("cloud") + 1 + if welcome_pages_model.currentPageIndex == cloud_page_idx and len(online_clusters) > 0: + welcome_pages_model.atEnd() for device_id, cluster_data in online_clusters.items(): if device_id not in self._remote_clusters: new_clusters.append(cluster_data)