aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-26 17:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Wrong check for OS X

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2016-10-11 18:42:39 +02:00
parent 9744b44b6e
commit ed7586656b
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp
View file

@ -36,6 +36,11 @@ CInstallDialog::CInstallDialog():QDialog()
onDestinationDefaultButtonClicked();
#ifdef Q_OS_MAC
// only 64 bits for OS X
clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
#else
// check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS())
{
@ -50,12 +55,7 @@ CInstallDialog::CInstallDialog():QDialog()
clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true);
}
#else
// only 64 bits for OS X
clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
}
#endif
const CServer &server = CConfigFile::getInstance()->getServer();

10
code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
View file

@ -50,6 +50,11 @@ CMigrateDialog::CMigrateDialog():QDialog()
onDestinationDefaultButtonClicked();
#ifdef Q_OS_MAC
// only 64 bits for OS X
clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
#else
// check whether OS architecture is 32 or 64 bits
if (CConfigFile::has64bitsOS())
{
@ -65,11 +70,6 @@ CMigrateDialog::CMigrateDialog():QDialog()
clientArch64RadioButton->setChecked(false);
clientArch32RadioButton->setChecked(true);
}
#else
// only 64 bits for OS X
clientArchGroupBox->setVisible(false);
clientArch64RadioButton->setChecked(true);
clientArch32RadioButton->setChecked(false);
#endif
const CServer &server = CConfigFile::getInstance()->getServer();