diff options
author | Enrico Turri <enricoturri@seznam.cz> | 2019-09-27 15:52:30 +0300 |
---|---|---|
committer | Enrico Turri <enricoturri@seznam.cz> | 2019-09-27 15:52:30 +0300 |
commit | 4b3eab0ed9f2b26abe525c162c9d0d8fc39b601a (patch) | |
tree | b94d88da7c483e7f23715a7d07f553fc57c27887 /src/slic3r/GUI/MainFrame.cpp | |
parent | f958cfd2ff88ab788f458b6149aa30fb982d7a4a (diff) | |
parent | d57a09558e692dc1f0975c8487dc33603762d5d9 (diff) |
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion
Diffstat (limited to 'src/slic3r/GUI/MainFrame.cpp')
-rw-r--r-- | src/slic3r/GUI/MainFrame.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index ae0413937..615d7d8a9 100644 --- a/src/slic3r/GUI/MainFrame.cpp +++ b/src/slic3r/GUI/MainFrame.cpp @@ -924,7 +924,7 @@ void MainFrame::load_config_file() wxString file; if (dlg.ShowModal() == wxID_OK) file = dlg.GetPath(); - if (! file.IsEmpty() && this->load_config_file(file.ToUTF8().data())) { + if (! file.IsEmpty() && this->load_config_file(file.ToUTF8().data())) { wxGetApp().app_config->update_config_dir(get_dir_name(file)); m_last_config = file; } |