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

merge conflicts

Browse source
This commit is contained in:
Henri van der Riet 2024-09-02 21:21:20 +02:00
parent e750727743
commit 5b0ddbd5f7
44 changed files with 492 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -123,7 +123,7 @@ void wxMediaCtrl2::Load(wxURI url)
});
} else {
CallAfter([] {
wxMessageBox(_L("Missing BambuSource component registered for media playing! Please re-install BambuStutio or seek after-sales help."), _L("Error"), wxOK);
wxMessageBox(_L("Missing BambuSource component registered for media playing! Please re-install BambuStudio or seek after-sales help."), _L("Error"), wxOK);
});
}
m_error = clsid != CLSID_BAMBU_SOURCE ? 101 : path.empty() ? 102 : 103;