amd/orcaslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Removed check for a 64bit build running on a 32bit system,

Browse source 
such condition could never be fulfilled.

Slightly polished the wording of the warning.
This commit is contained in:
Vojtech Bubnik 2021-11-19 11:07:25 +01:00
parent d8590ac0a8
commit 05ed0a9b60
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/slic3r/GUI/GUI_App.cpp
View file

@ -992,22 +992,13 @@ bool GUI_App::OnInit()
bool GUI_App::on_init_inner() bool GUI_App::on_init_inner()
{ {
// win32 build on win64 and viceversa #if defined(_WIN32) && ! defined(_WIN64)
#ifdef _WIN64 // Win32 32bit build.
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 (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "64") { if (wxPlatformInfo::Get().GetArchName().substr(0, 2) == "64") {
RichMessageDialog dlg(nullptr, RichMessageDialog dlg(nullptr,
_L("You have started PrusaSlicer for 32-bit architecture on 64-bit system." _L("You are running a 32 bit build of PrusaSlicer on 64-bit Windows."
"\nPlease download and install correct version at https://www.prusa3d.cz/prusaslicer/." "\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?"), "\nDo you wish to continue?"),
"PrusaSlicer", wxICON_QUESTION | wxYES_NO); "PrusaSlicer", wxICON_QUESTION | wxYES_NO);
if (dlg.ShowModal() != wxID_YES) if (dlg.ShowModal() != wxID_YES)