Fixed: Don't check if directory is empty when reinstalling in same directory

--HG--
branch : develop
feature/pipeline-tools
kervala 9 years ago
parent fc6415d64b
commit d1575b9f58

@ -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())
{

@ -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);

Loading…
Cancel
Save