3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-09 07:56:24 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX: crash on MediaFilePanel when download in empty list

Browse source 
Change-Id: I13f33005a8730498aea28b32da2818ceca055aac
This commit is contained in:
chunmao.guo 2022-09-01 11:14:55 +08:00 • committed by Lane.Wei
parent 7184960dce
commit 0a7f696101
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/ImageGrid.cpp
View file

@ -138,7 +138,7 @@ void Slic3r::GUI::ImageGrid::DoAction(size_t index, int action)
if (action == 0) { if (action == 0) {
m_file_sys->DeleteFiles(index); m_file_sys->DeleteFiles(index);
} else { } else {
if (index >= 0) { if (index != -1) {
auto &file = m_file_sys->GetFile(index); auto &file = m_file_sys->GetFile(index);
if (file.IsDownload() && file.progress >= -1) { if (file.IsDownload() && file.progress >= -1) {
if (file.progress >= 100) { if (file.progress >= 100) {

14
src/slic3r/GUI/MediaFilePanel.cpp
View file

@ -53,19 +53,23 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
m_type_panel->SetCornerRadius(FromDIP(5)); m_type_panel->SetCornerRadius(FromDIP(5));
m_type_panel->SetMinSize({-1, 48 * em_unit(this) / 10}); m_type_panel->SetMinSize({-1, 48 * em_unit(this) / 10});
m_button_timelapse = new ::Button(m_type_panel, _L("Timelapse"), "", wxBORDER_NONE); m_button_timelapse = new ::Button(m_type_panel, _L("Timelapse"), "", wxBORDER_NONE);
m_button_video = new ::Button(m_type_panel, _L("Video"), "", wxBORDER_NONE); m_button_timelapse->SetCanFocus(false);
m_button_video = new ::Button(m_type_panel, _L("Video"), "", wxBORDER_NONE);
m_button_video->SetCanFocus(false);
wxBoxSizer *type_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *type_sizer = new wxBoxSizer(wxHORIZONTAL);
type_sizer->Add(m_button_timelapse, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 24); type_sizer->Add(m_button_timelapse, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, 24);
type_sizer->Add(m_button_video, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 24); type_sizer->Add(m_button_video, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT, 24);
m_type_panel->SetSizer(type_sizer); m_type_panel->SetSizer(type_sizer);
top_sizer->Add(m_type_panel, 0, wxALIGN_CENTER_VERTICAL); //top_sizer->Add(m_type_panel, 0, wxALIGN_CENTER_VERTICAL);
// File management // File management
m_manage_panel = new ::StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE); m_manage_panel = new ::StaticBox(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxBORDER_NONE);
m_manage_panel->SetBackgroundColor(StateColor()); m_manage_panel->SetBackgroundColor(StateColor());
m_button_delete = new ::Button(m_manage_panel, _L("Delete")); m_button_delete = new ::Button(m_manage_panel, _L("Delete"));
m_button_download = new ::Button(m_manage_panel, _L("Download")); m_button_delete->SetCanFocus(false);
m_button_download = new ::Button(m_manage_panel, _L("Download"));
m_button_download->SetCanFocus(false);
m_button_management = new ::Button(m_manage_panel, _L("Management")); m_button_management = new ::Button(m_manage_panel, _L("Management"));
wxBoxSizer *manage_sizer = new wxBoxSizer(wxHORIZONTAL); wxBoxSizer *manage_sizer = new wxBoxSizer(wxHORIZONTAL);
@ -110,7 +114,10 @@ MediaFilePanel::MediaFilePanel(wxWindow * parent)
auto b = dynamic_cast<Button *>(e.GetEventObject()); auto b = dynamic_cast<Button *>(e.GetEventObject());
if (b == m_button_video) if (b == m_button_video)
type = PrinterFileSystem::F_VIDEO; type = PrinterFileSystem::F_VIDEO;
if (m_last_type == type)
return;
m_image_grid->SetFileType(type); m_image_grid->SetFileType(type);
m_last_type = type;
{ {
wxCommandEvent e(wxEVT_CHECKBOX); wxCommandEvent e(wxEVT_CHECKBOX);
e.SetEventObject(m_button_timelapse); e.SetEventObject(m_button_timelapse);
@ -176,6 +183,7 @@ void MediaFilePanel::SetMachineObject(MachineObject* obj)
m_image_grid->SetStatus(m_bmp_failed.bmp(), _L("No printers.")); m_image_grid->SetStatus(m_bmp_failed.bmp(), _L("No printers."));
} else { } else {
boost::shared_ptr<PrinterFileSystem> fs(new PrinterFileSystem); boost::shared_ptr<PrinterFileSystem> fs(new PrinterFileSystem);
m_image_grid->SetFileType(m_last_type);
m_image_grid->SetFileSystem(fs); m_image_grid->SetFileSystem(fs);
fs->Bind(EVT_MODE_CHANGED, &MediaFilePanel::modeChanged, this); fs->Bind(EVT_MODE_CHANGED, &MediaFilePanel::modeChanged, this);
fs->Bind(EVT_STATUS_CHANGED, [this, wfs = boost::weak_ptr(fs)](auto &e) { fs->Bind(EVT_STATUS_CHANGED, [this, wfs = boost::weak_ptr(fs)](auto &e) {

1
src/slic3r/GUI/MediaFilePanel.h
View file

@ -68,6 +68,7 @@ private:
ImageGrid * m_image_grid = nullptr; ImageGrid * m_image_grid = nullptr;
int m_last_mode = 0; int m_last_mode = 0;
int m_last_type = 0;
}; };