Merge with develop

--HG-- branch : compatibility-develop
9 years ago · 5b93785499
parent 2d8407157b c5e57273a9
commit 5b93785499
1 changed files with 2 additions and 1 deletions
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@ -779,7 +779,8 @@ void initLoginScreen()

 	ClientApp = ClientCfg.ConfigFile.getVar("Application").asString(0);

-	string l = ClientCfg.LastLogin;
+	// give priority to login specified as argument
+	string l = !LoginLogin.empty() ? LoginLogin:ClientCfg.LastLogin;

 	if(!l.empty())
 	{