From 8a2dbd1c101d84dcb922bd048a25f289d9c8882d Mon Sep 17 00:00:00 2001 From: grant0013 Date: Thu, 28 May 2026 08:10:21 +0000 Subject: [PATCH] Fix merge-resolution braces in PrintHostDialogs.hpp + PhysicalPrinterDialog.cpp The 8dfd480c52 merge stripped <<<<<<<, =======, >>>>>>> markers from three files. Two of the resolutions ended up syntactically broken: * PrintHostDialogs.hpp: both sides of the conflict added a new class declaration in the same spot. The common closing }; lived after the >>>>>>> marker, so concatenating without re-adding a closing brace between the two classes left CrealityPrintHostSendDialog unclosed. Compiler caught it via "storage class specified for EVT_PRINTHOST_PROGRESS" at the wxDECLARE_EVENT lines (the events were being parsed inside the still-open class body). * PhysicalPrinterDialog.cpp: upstream's BonjourDialog fallback was inside an `else { }` block whose closing brace remained after I replaced the else with explicit early-return branches. Result was one extra `}` after the Bonjour block. No public commits affected -- the broken merge commit is still local-only on LXC 104. Catching this before the force-push. --- src/slic3r/GUI/PhysicalPrinterDialog.cpp | 1 - src/slic3r/GUI/PrintHostDialogs.hpp | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/PhysicalPrinterDialog.cpp b/src/slic3r/GUI/PhysicalPrinterDialog.cpp index c29c156a9f..760c157502 100644 --- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp +++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp @@ -257,7 +257,6 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr m_optgroup->set_value("print_host", dialog.get_selected(), true); m_optgroup->get_field("print_host")->field_changed(); } - } }); return sizer; diff --git a/src/slic3r/GUI/PrintHostDialogs.hpp b/src/slic3r/GUI/PrintHostDialogs.hpp index a0a7cc8a98..988d4c8171 100644 --- a/src/slic3r/GUI/PrintHostDialogs.hpp +++ b/src/slic3r/GUI/PrintHostDialogs.hpp @@ -217,6 +217,8 @@ private: }; std::vector m_printer_slots; std::vector m_slot_combos; // one per gcode filament +}; + class FlashforgePrintHostSendDialog : public PrintHostSendDialog { public: