From 80c92d1331331b159a102013f0cd8437acc22807 Mon Sep 17 00:00:00 2001 From: David Kocik Date: Wed, 8 Feb 2023 10:46:04 +0100 Subject: [PATCH] missing includes and typos --- src/slic3r/GUI/ConfigWizard.cpp | 6 +++--- src/slic3r/GUI/ConfigWizard.hpp | 4 +++- src/slic3r/GUI/ConfigWizard_private.hpp | 2 -- src/slic3r/GUI/GUI_App.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/ConfigWizard.cpp b/src/slic3r/GUI/ConfigWizard.cpp index 0fb9349964..b45d220b8e 100644 --- a/src/slic3r/GUI/ConfigWizard.cpp +++ b/src/slic3r/GUI/ConfigWizard.cpp @@ -3035,9 +3035,9 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese #ifdef __linux__ // Desktop integration on Linux - BOOST_LOG_TRIVIAL(debug) << "ConfigWizard::priv::apply_config integrate_desktop" << page_welcome->integrate_desktop() << " perform_registration_linux " << page_downloader->downloader->get_perform_registration_linux(); - if (page_welcome->integrate_desktop() || page_downloader->downloader->get_perform_registration_linux()) - DesktopIntegrationDialog::perform_desktop_integration(page_downloader->downloader->get_perform_registration_linux()); + BOOST_LOG_TRIVIAL(debug) << "ConfigWizard::priv::apply_config integrate_desktop" << page_welcome->integrate_desktop() << " perform_registration_linux " << page_downloader->m_downloader->get_perform_registration_linux(); + if (page_welcome->integrate_desktop() || page_downloader->m_downloader->get_perform_registration_linux()) + DesktopIntegrationDialog::perform_desktop_integration(page_downloader->m_downloader->get_perform_registration_linux()); #endif // Decide whether to create snapshot based on run_reason and the reset profile checkbox diff --git a/src/slic3r/GUI/ConfigWizard.hpp b/src/slic3r/GUI/ConfigWizard.hpp index 4520dbb8ff..dcd0297ae9 100644 --- a/src/slic3r/GUI/ConfigWizard.hpp +++ b/src/slic3r/GUI/ConfigWizard.hpp @@ -4,6 +4,8 @@ #include #include +#include +#include #include "GUI_Utils.hpp" @@ -17,7 +19,7 @@ namespace GUI { namespace DownloaderUtils { class Worker : public wxBoxSizer { - wxWindow* m_parent{ nullptr }; + wxWindow* m_parent{ nullptr }; wxTextCtrl* m_input_path{ nullptr }; bool downloader_checked{ false }; #ifdef __linux__ diff --git a/src/slic3r/GUI/ConfigWizard_private.hpp b/src/slic3r/GUI/ConfigWizard_private.hpp index 832bef46c9..2dc2c2e233 100644 --- a/src/slic3r/GUI/ConfigWizard_private.hpp +++ b/src/slic3r/GUI/ConfigWizard_private.hpp @@ -10,12 +10,10 @@ #include #include -#include #include #include #include #include -#include #include #include #include diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index b645593623..cdebbb4010 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -3084,7 +3084,7 @@ void GUI_App::show_downloader_registration_dialog() auto downloader_worker = new DownloaderUtils::Worker(nullptr); downloader_worker->perform_register(app_config->get("url_downloader_dest")); #ifdef __linux__ - if (downloader->get_perform_registration_linux()) + if (downloader_worker->get_perform_registration_linux()) DesktopIntegrationDialog::perform_desktop_integration(true); #endif // __linux__ } else {