diff --git a/src/slic3r/GUI/AboutDialog.cpp b/src/slic3r/GUI/AboutDialog.cpp index e00e9afe4..f2270857e 100644 --- a/src/slic3r/GUI/AboutDialog.cpp +++ b/src/slic3r/GUI/AboutDialog.cpp @@ -326,7 +326,7 @@ AboutDialog::AboutDialog() copyright_hor_sizer->Add(copyright_ver_sizer, 0, wxLEFT, FromDIP(20)); - wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright(C) 2021-2024 Lunkuo All Rights Reserved", wxDefaultPosition, wxDefaultSize); + wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright(C) 2021-2025 Lunkuo All Rights Reserved", wxDefaultPosition, wxDefaultSize); html_text->SetForegroundColour(wxColour(107, 107, 107)); copyright_ver_sizer->Add(html_text, 0, wxALL , 0); diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index ebf86d57c..0c7ca749d 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -2682,18 +2682,23 @@ bool GUI_App::on_init_inner() BOOST_LOG_TRIVIAL(info) << boost::format("gui mode, Current BambuStudio Version %1%")%SLIC3R_VERSION; BOOST_LOG_TRIVIAL(info) << get_system_info(); #if defined(__WINDOWS__) - SYSTEM_INFO sysInfo; - GetNativeSystemInfo(&sysInfo); - switch (sysInfo.wProcessorArchitecture) { - case PROCESSOR_ARCHITECTURE_ARM64: - m_is_arm64 = true; - break; - case PROCESSOR_ARCHITECTURE_AMD64: - default: - m_is_arm64 = false; - break; + USHORT processMachine = 0; + USHORT nativeMachine = 0; + if (IsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine)) { + switch (nativeMachine) { + case IMAGE_FILE_MACHINE_ARM64: + m_is_arm64 = true; + break; + case IMAGE_FILE_MACHINE_AMD64: + default: + m_is_arm64 = false; + break; + } + BOOST_LOG_TRIVIAL(info) << boost::format("processMachine architecture %1%, nativeMachine %2% m_is_arm64 %3%")%(int)(processMachine) %(int) nativeMachine %m_is_arm64; + } + else { + BOOST_LOG_TRIVIAL(info) << boost::format("IsWow64Process2 failed, m_is_arm64 %1%") %m_is_arm64; } - BOOST_LOG_TRIVIAL(info) << boost::format("process architecture %1%, m_is_arm64 %2%")%(int)(sysInfo.wProcessorArchitecture) %m_is_arm64; #endif // Enable this to get the default Win32 COMCTRL32 behavior of static boxes. // wxSystemOptions::SetOption("msw.staticbox.optimized-paint", 0);