juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-07-28 21:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge-resolution braces in PrintHostDialogs.hpp + PhysicalPrinterDialog.cpp

Browse Source 
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.
This commit is contained in:
grant0013
2026-05-28 08:10:21 +00:00
parent 8dfd480c52
commit 8a2dbd1c10
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/slic3r/GUI/PhysicalPrinterDialog.cpp
View File

@@ -257,7 +257,6 @@ void PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
m_optgroup->set_value("print_host", dialog.get_selected(), true); m_optgroup->set_value("print_host", dialog.get_selected(), true);
m_optgroup->get_field("print_host")->field_changed(); m_optgroup->get_field("print_host")->field_changed();
} }
}
}); });
return sizer; return sizer;

2
src/slic3r/GUI/PrintHostDialogs.hpp
View File

@@ -217,6 +217,8 @@ private:
}; };
std::vector<SlotInfo> m_printer_slots; std::vector<SlotInfo> m_printer_slots;
std::vector<BitmapComboBox*> m_slot_combos; // one per gcode filament std::vector<BitmapComboBox*> m_slot_combos; // one per gcode filament
};
class FlashforgePrintHostSendDialog : public PrintHostSendDialog class FlashforgePrintHostSendDialog : public PrintHostSendDialog
{ {
public: public: