From 9febb7374a57a34d20fa740241dd1dc1b109f8cc Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 28 Jan 2016 13:27:35 +0100 Subject: [PATCH] merge with develop --- code/nel/src/misc/cmd_args.cpp | 2 +- .../client/client_config_qt/client_config_dialog.cpp | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/nel/src/misc/cmd_args.cpp b/code/nel/src/misc/cmd_args.cpp index 13d08428b..11464b222 100644 --- a/code/nel/src/misc/cmd_args.cpp +++ b/code/nel/src/misc/cmd_args.cpp @@ -172,7 +172,7 @@ bool CCmdArgs::haveAdditionalArg(const std::string &name) const // they don't have any short or long name, but need a name in help if (arg.shortName.empty() && arg.longName.empty() && !arg.helpName.empty() && arg.helpName == name && arg.found) - return false; + return true; } return false; diff --git a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp index 895db9873..bfa9bbc58 100644 --- a/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp +++ b/code/ryzom/tools/client/client_config_qt/client_config_dialog.cpp @@ -75,6 +75,10 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) : item = treeWidget->topLevelItem( 3 )->child( 1 ); item->setData( 0, Qt::UserRole, 7 ); +#ifndef Q_OS_WIN + // Hide Direct3D page under Linux and OS X + item->setHidden(true); +#endif CategoryStackedWidget->addWidget( new CGeneralSettingsWidget( CategoryStackedWidget ) ); CategoryStackedWidget->addWidget( new CDisplaySettingsWidget( CategoryStackedWidget ) ); @@ -85,6 +89,7 @@ CClientConfigDialog::CClientConfigDialog( QWidget *parent ) : CategoryStackedWidget->addWidget( new CSysInfoOpenGLWidget( CategoryStackedWidget ) ); #ifdef Q_OS_WIN + // Add Direct3D widget only under Windows CategoryStackedWidget->addWidget( new CSysInfoD3DWidget( CategoryStackedWidget ) ); #endif @@ -142,12 +147,10 @@ void CClientConfigDialog::onClickPlay() #ifdef Q_OS_WIN32 started = QProcess::startDetached( "ryzom_client_r.exe" ); - if( !started ) - QProcess::startDetached( "ryzom_client_rd.exe" ); if( !started ) QProcess::startDetached( "ryzom_client_d.exe" ); #elif defined(Q_OS_MAC) - started = QProcess::startDetached( "./Ryzom" ); + started = QProcess::startDetached( "./Ryzom.app" ); #else started = QProcess::startDetached( "./ryzom_client" ); #endif