FIX: Hidden Model Mall Entrance
Change-Id: If5a5d0d0b8925da3b1637f98c767c1c5df0ef6ed
This commit is contained in:
parent
570d374cbb
commit
3e03344c23
|
@ -1456,7 +1456,7 @@ void StatusPanel::update_tasklist_info()
|
||||||
}
|
}
|
||||||
|
|
||||||
void StatusPanel::on_market_scoring(wxCommandEvent &event) {
|
void StatusPanel::on_market_scoring(wxCommandEvent &event) {
|
||||||
if (obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
|
if (obj && obj->get_modeltask() && obj->get_modeltask()->design_id > 0) {
|
||||||
market_model_scoring_page(obj->get_modeltask()->design_id);
|
market_model_scoring_page(obj->get_modeltask()->design_id);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -2477,6 +2477,7 @@ void StatusPanel::update_subtask(MachineObject *obj)
|
||||||
m_button_abort->SetBitmap_("print_control_stop_disable");
|
m_button_abort->SetBitmap_("print_control_stop_disable");
|
||||||
m_button_pause_resume->Enable(false);
|
m_button_pause_resume->Enable(false);
|
||||||
m_button_pause_resume->SetBitmap_("print_control_resume_disable");
|
m_button_pause_resume->SetBitmap_("print_control_resume_disable");
|
||||||
|
if (wxGetApp().has_model_mall()) {
|
||||||
bool is_market_task = obj->get_modeltask() && obj->get_modeltask()->design_id > 0;
|
bool is_market_task = obj->get_modeltask() && obj->get_modeltask()->design_id > 0;
|
||||||
if (is_market_task) {
|
if (is_market_task) {
|
||||||
m_button_market_scoring->Show();
|
m_button_market_scoring->Show();
|
||||||
|
@ -2500,6 +2501,7 @@ void StatusPanel::update_subtask(MachineObject *obj)
|
||||||
} else {
|
} else {
|
||||||
m_button_market_scoring->Hide();
|
m_button_market_scoring->Hide();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
m_button_abort->Enable(true);
|
m_button_abort->Enable(true);
|
||||||
m_button_abort->SetBitmap_("print_control_stop");
|
m_button_abort->SetBitmap_("print_control_stop");
|
||||||
|
|
Loading…
Reference in New Issue