1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

correct remove profile

fix #2284
This commit is contained in:
PKEv 2015-09-24 02:00:22 +03:00
parent eb1d70176d
commit ae9b29cfae

View File

@ -158,11 +158,14 @@ Profile::~Profile()
saveToxSave(); saveToxSave();
delete core; delete core;
delete coreThread; delete coreThread;
if (!isRemoved)
{
Settings::getInstance().savePersonal(this); Settings::getInstance().savePersonal(this);
Settings::getInstance().sync(); Settings::getInstance().sync();
ProfileLocker::assertLock(); ProfileLocker::assertLock();
assert(ProfileLocker::getCurLockName() == name); assert(ProfileLocker::getCurLockName() == name);
ProfileLocker::unlock(); ProfileLocker::unlock();
}
} }
QVector<QString> Profile::getFilesByExt(QString extension) QVector<QString> Profile::getFilesByExt(QString extension)
@ -368,6 +371,7 @@ void Profile::remove()
} }
} }
QString path = Settings::getInstance().getSettingsDirPath() + name; QString path = Settings::getInstance().getSettingsDirPath() + name;
ProfileLocker::unlock();
QFile::remove(path+".tox"); QFile::remove(path+".tox");
QFile::remove(path+".ini"); QFile::remove(path+".ini");