GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-04 20:10:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix of gcode viewer crash.

Browse Source 
Bind Account events only if editor.
This commit is contained in:
David Kocik 2024-04-19 16:34:00 +02:00
parent 63e25828ae
commit 72fa3da675
2 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/slic3r/GUI/GUI_App.cpp
View File

@ -3801,10 +3801,10 @@ void GUI_App::handle_connect_request_printer_pick(const std::string& msg)
// return to plater // return to plater
this->mainframe->select_tab(size_t(0)); this->mainframe->select_tab(size_t(0));
//if (!select_printer_from_connect(msg)) { if (!select_printer_from_connect(msg)) {
// // If printer was not selected, do not select filament. // If printer was not selected, do not select filament.
// return; return;
//} }
// TODO: Selecting SLA material // TODO: Selecting SLA material
if (Preset::printer_technology(preset_bundle->printers.get_selected_preset().config) != ptFFF) { if (Preset::printer_technology(preset_bundle->printers.get_selected_preset().config) != ptFFF) {
return; return;

18
src/slic3r/GUI/Plater.cpp
View File

@ -847,33 +847,32 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
wxGetApp().mainframe->Raise(); wxGetApp().mainframe->Raise();
this->q->load_files(input_files); this->q->load_files(input_files);
}); });
this->q->Bind(EVT_INSTANCE_GO_TO_FRONT, [this](InstanceGoToFrontEvent&) {
bring_instance_forward();
});
// Downloader and USerAccount Events doesnt need to be binded in viewer.
// Not binding Account events prevents it from loging in.
if (wxGetApp().is_editor()) {
this->q->Bind(EVT_START_DOWNLOAD_OTHER_INSTANCE, [](StartDownloadOtherInstanceEvent& evt) { this->q->Bind(EVT_START_DOWNLOAD_OTHER_INSTANCE, [](StartDownloadOtherInstanceEvent& evt) {
BOOST_LOG_TRIVIAL(trace) << "Received url from other instance event."; BOOST_LOG_TRIVIAL(trace) << "Received url from other instance event.";
wxGetApp().mainframe->Raise(); wxGetApp().mainframe->Raise();
for (size_t i = 0; i < evt.data.size(); ++i) { for (size_t i = 0; i < evt.data.size(); ++i) {
wxGetApp().start_download(evt.data[i]); wxGetApp().start_download(evt.data[i]);
} }
}); });
this->q->Bind(EVT_LOGIN_OTHER_INSTANCE, [this](LoginOtherInstanceEvent& evt) { this->q->Bind(EVT_LOGIN_OTHER_INSTANCE, [this](LoginOtherInstanceEvent& evt) {
BOOST_LOG_TRIVIAL(trace) << "Received login from other instance event."; BOOST_LOG_TRIVIAL(trace) << "Received login from other instance event.";
user_account->on_login_code_recieved(evt.data); user_account->on_login_code_recieved(evt.data);
}); });
this->q->Bind(EVT_INSTANCE_GO_TO_FRONT, [this](InstanceGoToFrontEvent &) {
bring_instance_forward();
});
this->q->Bind(EVT_OPEN_PRUSAAUTH, [](OpenPrusaAuthEvent& evt) { this->q->Bind(EVT_OPEN_PRUSAAUTH, [](OpenPrusaAuthEvent& evt) {
BOOST_LOG_TRIVIAL(info) << "open browser: " << evt.data; BOOST_LOG_TRIVIAL(info) << "open browser: " << evt.data;
// first register url to be sure to get the code back // first register url to be sure to get the code back
//auto downloader_worker = new DownloaderUtils::Worker(nullptr); //auto downloader_worker = new DownloaderUtils::Worker(nullptr);
DownloaderUtils::Worker::perform_register(wxGetApp().app_config->get("url_downloader_dest")); DownloaderUtils::Worker::perform_register(wxGetApp().app_config->get("url_downloader_dest"));
#ifdef __linux__ #ifdef __linux__
if (DownloaderUtils::Worker::perform_registration_linux) if (DownloaderUtils::Worker::perform_registration_linux)
DesktopIntegrationDialog::perform_downloader_desktop_integration(); DesktopIntegrationDialog::perform_downloader_desktop_integration();
#endif // __linux__ #endif // __linux__
// than open url // than open url
wxGetApp().open_login_browser_with_dialog(evt.data); wxGetApp().open_login_browser_with_dialog(evt.data);
}); });
@ -961,6 +960,7 @@ Plater::priv::priv(Plater *q, MainFrame *main_frame)
wxGetApp().update_login_dialog(); wxGetApp().update_login_dialog();
#endif // 0 #endif // 0
}); });
}
wxGetApp().other_instance_message_handler()->init(this->q); wxGetApp().other_instance_message_handler()->init(this->q);