Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2016-10-04 12:04:23 +02:00
parent 98066af393
commit 643c0fabf2
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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