From ec7ffa8c0ed02ca0837b3ac15ca167ade8eb6bad Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 15 Aug 2024 04:58:16 +0100 Subject: [PATCH] Windows installer: Warn if installing x64 on ARM system --- app/win/installer/installer.nsi | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/win/installer/installer.nsi b/app/win/installer/installer.nsi index 89d332bfa1..83482e5b84 100755 --- a/app/win/installer/installer.nsi +++ b/app/win/installer/installer.nsi @@ -959,7 +959,20 @@ Function .onInit Call UninstallOld SetRegView 64 !endif - + + !ifdef HAVE_64BIT_BUILD + ${If} "${ARCH}" == "x64" + ${If} ${IsNativeARM64} + MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 \ + "This installer is for the x64 version of Zotero, but you appear to be running an ARM version of Windows.$\n$\nFor the best performance, please cancel and download the ARM version of Zotero for Windows." \ + /SD IDOK IDOK continue_architecture IDCANCEL cancel_architecture + cancel_architecture: + Abort + continue_architecture: + ${EndIf} + ${EndIf} + !endif + !ifndef HAVE_64BIT_BUILD ${If} ${RunningX64} MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION|MB_DEFBUTTON2 \