juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-01 15:22:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into dev/p2s-pr

Browse Source 
# Conflicts:
#	src/slic3r/GUI/DeviceErrorDialog.cpp
This commit is contained in:
Noisyfox
2025-11-09 12:35:32 +08:00
parent df734857cc 08bd21310c
commit 614612ed38
48 changed files with 3533 additions and 3528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/Jobs/OAuthJob.cpp
View File

@@ -105,7 +105,7 @@ void OAuthJob::process(Ctl& ctl)
// Handle timeout
if (!received && ctl.was_canceled()) {
_data.result->error_message = _u8L("User cancelled.");
_data.result->error_message = _u8L("User canceled.");
} else {
// Wait a while to ensure the response has sent
std::this_thread::sleep_for(std::chrono::milliseconds(1500));