Merge remote-tracking branch 'origin/21-fix-nopatch-without-argument-crash' into main/yubo-dev

3 years ago · 048e344bbd
parent fd04303cf2 e77d7e8f08
commit 048e344bbd
1 changed files with 1 additions and 1 deletions
--- a/ryzom/client/src/far_tp.cpp
+++ b/ryzom/client/src/far_tp.cpp
@ -466,7 +466,7 @@ void CLoginStateMachine::run()
 			/// check the data to check if patch needed
 			CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_PostLogin, "login_step_post_login"));

-			if (!ClientCfg.PatchWanted || (Args.haveArg("n") && Args.getLongArg("nopatch").front() == "1"))
+			if (!ClientCfg.PatchWanted || Args.haveLongArg("nopatch"))
 			{
 				// client don't want to be patched !
 				_CurrentState = st_display_eula;