From d641f947d6e95aa662804cadc2d14469b777ebd4 Mon Sep 17 00:00:00 2001 From: "lane.wei" Date: Fri, 21 Oct 2022 21:28:18 +0800 Subject: [PATCH] ENH: some small refines 1. don't sync_tooltip for it is not used 2. enable the dll black list 3. add some log Change-Id: I4f7ea008121cf7252ef32680b68f063d146661e5 --- src/BambuStudio.cpp | 22 +++++++++++----------- src/libslic3r/AppConfig.cpp | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/BambuStudio.cpp b/src/BambuStudio.cpp index 368797dae..ceaab0e23 100644 --- a/src/BambuStudio.cpp +++ b/src/BambuStudio.cpp @@ -1485,17 +1485,17 @@ bool CLI::setup(int argc, char **argv) // Notify user that a blacklisted DLL was injected into BambuStudio process (for example Nahimic, see GH #5573). // We hope that if a DLL is being injected into a BambuStudio process, it happens at the very start of the application, // thus we shall detect them now. - //if (BlacklistedLibraryCheck::get_instance().perform_check()) { - // std::wstring text = L"Following DLLs have been injected into the BambuStudio process:\n\n"; - // text += BlacklistedLibraryCheck::get_instance().get_blacklisted_string(); - // text += L"\n\n" - // L"BambuStudio is known to not run correctly with these DLLs injected. " - // L"We suggest stopping or uninstalling these services if you experience " - // L"crashes or unexpected behaviour while using BambuStudio.\n" - // L"For example, ASUS Sonic Studio injects a Nahimic driver, which makes BambuStudio " - // L"to crash on a secondary monitor, see BambuStudio github issue #5573"; - // MessageBoxW(NULL, text.c_str(), L"Warning"/*L"Incopatible library found"*/, MB_OK); - //} + if (BlacklistedLibraryCheck::get_instance().perform_check()) { + std::wstring text = L"Following DLLs have been injected into the BambuStudio process:\n\n"; + text += BlacklistedLibraryCheck::get_instance().get_blacklisted_string(); + text += L"\n\n" + L"BambuStudio is known to not run correctly with these DLLs injected. " + L"We suggest stopping or uninstalling these services if you experience " + L"crashes or unexpected behaviour while using BambuStudio.\n" + L"For example, ASUS Sonic Studio injects a Nahimic driver, which makes BambuStudio " + L"to crash on a secondary monitor"; + MessageBoxW(NULL, text.c_str(), L"Warning"/*L"Incopatible library found"*/, MB_OK); + } #endif // See Invoking prusa-slicer from $PATH environment variable crashes #5542 diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp index 9340ba784..7c7e89f0a 100644 --- a/src/libslic3r/AppConfig.cpp +++ b/src/libslic3r/AppConfig.cpp @@ -288,7 +288,7 @@ void AppConfig::set_defaults() if (get("backup_interval").empty()) { set("backup_interval", "10"); } - + if (get("curr_bed_type").empty()) { set("curr_bed_type", "0"); }