Merge with develop

--HG--
branch : compatibility-develop

code/ryzom/tools/client/ryzom_installer/src/installdialog.cpp

@@ -186,11 +186,15 @@ void CInstallDialog::accept()
 		return;
 	}
 
+	// if reinstalling in same directory, don't check if directory is empty
+	if (m_dstDirectory != CConfigFile::getInstance()->getNewInstallationDirectory())
+	{
 		if (!isDirectoryEmpty(m_dstDirectory, true))
 		{
 			QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one."));
 			return;
 		}
+	}
 
 	if (oldDirectoryRadioButton->isChecked())
 	{

code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp

@@ -154,11 +154,15 @@ void CMigrateDialog::accept()
 		return;
 	}
 
+	// if reinstalling in same directory, don't check if directory is empty
+	if (m_dstDirectory != CConfigFile::getInstance()->getNewInstallationDirectory())
+	{
 		if (!isDirectoryEmpty(m_dstDirectory, true))
 		{
 			QMessageBox::StandardButton res = QMessageBox::warning(this, tr("Directory not empty"), tr("This directory is not empty, please choose another one."));
 			return;
 		}
+	}
 
 	CConfigFile::getInstance()->setSrcServerDirectory(m_currentDirectory);
 	CConfigFile::getInstance()->setInstallationDirectory(m_dstDirectory);