diff --git a/src/BambuStudio.cpp b/src/BambuStudio.cpp index 6585ece0a..578cc660f 100644 --- a/src/BambuStudio.cpp +++ b/src/BambuStudio.cpp @@ -95,7 +95,7 @@ static void glfw_callback(int error_code, const char* description) int CLI::run(int argc, char **argv) { // Mark the main thread for the debugger and for runtime checks. - set_current_thread_name("bambustudio_main"); + set_current_thread_name("bambustu_main"); #ifdef __WXGTK__ // On Linux, wxGTK has no support for Wayland, and the app crashes on @@ -1736,7 +1736,7 @@ LONG WINAPI VectoredExceptionHandler(PEXCEPTION_POINTERS pExceptionInfo) #if defined(_MSC_VER) || defined(__MINGW32__) extern "C" { - __declspec(dllexport) int __stdcall bambustudio_main(int argc, wchar_t **argv) + __declspec(dllexport) int __stdcall bambustu_main(int argc, wchar_t **argv) { // Convert wchar_t arguments to UTF8. std::vector argv_narrow; diff --git a/src/BambuStudio_app_msvc.cpp b/src/BambuStudio_app_msvc.cpp index 5dfc4c463..41fee0901 100644 --- a/src/BambuStudio_app_msvc.cpp +++ b/src/BambuStudio_app_msvc.cpp @@ -204,7 +204,7 @@ bool OpenGLVersionCheck::message_pump_exit = false; extern "C" { typedef int (__stdcall *Slic3rMainFunc)(int argc, wchar_t **argv); - Slic3rMainFunc bambustudio_main = nullptr; + Slic3rMainFunc bambustu_main = nullptr; } extern "C" { @@ -295,19 +295,19 @@ int wmain(int argc, wchar_t **argv) } // resolve function address here - bambustudio_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r, + bambustu_main = (Slic3rMainFunc)GetProcAddress(hInstance_Slic3r, #ifdef _WIN64 // there is just a single calling conversion, therefore no mangling of the function name. - "bambustudio_main" + "bambustu_main" #else // stdcall calling convention declaration - "_bambustudio_main@8" + "_bambustu_main@8" #endif ); - if (bambustudio_main == nullptr) { - printf("could not locate the function bambustudio_main in BambuStudio.dll\n"); + if (bambustu_main == nullptr) { + printf("could not locate the function bambustu_main in BambuStudio.dll\n"); return -1; } // argc minus the trailing nullptr of the argv - return bambustudio_main((int)argv_extended.size() - 1, argv_extended.data()); + return bambustu_main((int)argv_extended.size() - 1, argv_extended.data()); } } diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 03b42cfe5..47bc7dbf1 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -525,7 +525,7 @@ void AppConfig::save() { // Returns "undefined" if the thread naming functionality is not supported by the operating system. std::optional current_thread_name = get_current_thread_name(); - if (current_thread_name && *current_thread_name != "bambustudio_main") + if (current_thread_name && *current_thread_name != "bambustu_main") throw CriticalException("Calling AppConfig::save() from a worker thread!"); } @@ -777,7 +777,7 @@ void AppConfig::save() { // Returns "undefined" if the thread naming functionality is not supported by the operating system. std::optional current_thread_name = get_current_thread_name(); - if (current_thread_name && *current_thread_name != "bambustudio_main") + if (current_thread_name && *current_thread_name != "bambustu_main") throw CriticalException("Calling AppConfig::save() from a worker thread!"); }