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

Changed: Only remove directories if not empty path

Browse source
This commit is contained in:
kervala 2016-06-14 19:49:03 +02:00
parent 913914f0cb
commit d95b4650eb
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -722,6 +722,8 @@ void COperationDialog::deleteComponentsServers()
QString path = server.getDirectory(); QString path = server.getDirectory();
if (!path.isEmpty())
{
QDir dir(path); QDir dir(path);
if (dir.exists() && !dir.removeRecursively()) if (dir.exists() && !dir.removeRecursively())
@ -730,6 +732,7 @@ void COperationDialog::deleteComponentsServers()
return; return;
} }
} }
}
emit success(m_components.servers.size()); emit success(m_components.servers.size());
emit done(); emit done();
@ -761,11 +764,16 @@ void COperationDialog::deleteComponentsProfiles()
QString path = profile.getDirectory(); QString path = profile.getDirectory();
if (!path.isEmpty())
{
QDir dir(path);
if (dir.exists() && !dir.removeRecursively()) if (dir.exists() && !dir.removeRecursively())
{ {
emit fail(tr("Unable to delete files for profile %1").arg(profile.name)); emit fail(tr("Unable to delete files for profile %1").arg(profile.name));
return; return;
} }
}
// delete profile // delete profile
config->removeProfile(profileId); config->removeProfile(profileId);