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

Fixed conflicts after merge with master branch

Browse source
This commit is contained in:
Enrico Turri 2018-06-25 15:26:37 +02:00
commit b6b14ef819
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -403,7 +403,7 @@ void add_config_menu(wxMenuBar *menu, int event_preferences_changed, int event_l
save_language();
show_info(g_wxTabPanel, _(L("Application will be restarted")), _(L("Attention!")));
if (event_language_change > 0) {
g_3DScene->remove_all_canvases();// remove all canvas before recreate GUI
_3DScene::remove_all_canvases();// remove all canvas before recreate GUI
wxCommandEvent event(event_language_change);
g_wxApp->ProcessEvent(event);
}