From 05ed0a9b60684015be2ae5841da9247fb9460722 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Fri, 19 Nov 2021 11:07:25 +0100 Subject: [PATCH] Removed check for a 64bit build running on a 32bit system, such condition could never be fulfilled. Slightly polished the wording of the warning. --- src/slic3r/GUI/GUI_App.cpp | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index 4571b73466..94f0995670 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -992,22 +992,13 @@ bool GUI_App::OnInit() bool GUI_App::on_init_inner() { -// win32 build on win64 and viceversa -#ifdef _WIN64 - if (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "") { - RichMessageDialog dlg(nullptr, - _L("You have started PrusaSlicer for 64-bit architecture on 32-bit system." - "\nPlease download and install correct version at https://www.prusa3d.cz/prusaslicer/." - "\nDo you wish to continue?"), - "PrusaSlicer", wxICON_QUESTION | wxYES_NO); - if (dlg.ShowModal() != wxID_YES) - return false; - } -#elif _WIN32 +#if defined(_WIN32) && ! defined(_WIN64) + // Win32 32bit build. if (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "64") { RichMessageDialog dlg(nullptr, - _L("You have started PrusaSlicer for 32-bit architecture on 64-bit system." - "\nPlease download and install correct version at https://www.prusa3d.cz/prusaslicer/." + _L("You are running a 32 bit build of PrusaSlicer on 64-bit Windows." + "\n32 bit build of PrusaSlicer will likely not be able to utilize all the RAM available in the system." + "\nPlease download and install a 64 bit build of PrusaSlice from https://www.prusa3d.cz/prusaslicer/." "\nDo you wish to continue?"), "PrusaSlicer", wxICON_QUESTION | wxYES_NO); if (dlg.ShowModal() != wxID_YES)