StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3172

Browse Source 
Impyy (1):
      fix(profile): Don't require .ini to load profile
This commit is contained in:
sudden6 2016-04-23 12:28:27 +02:00
commit 56e59d0fa3
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/persistence/profile.cpp
View File

@ -202,17 +202,11 @@ void Profile::scanProfiles()
for (QString toxfile : toxfiles) for (QString toxfile : toxfiles)
{ {
if (!inifiles.contains(toxfile)) if (!inifiles.contains(toxfile))
importProfile(toxfile); Settings::getInstance().createPersonal(toxfile);
profiles.append(toxfile); profiles.append(toxfile);
} }
} }
void Profile::importProfile(QString name)
{
assert(!exists(name));
Settings::getInstance().createPersonal(name);
}
QVector<QString> Profile::getProfiles() QVector<QString> Profile::getProfiles()
{ {
return profiles; return profiles;
@ -464,7 +458,7 @@ void Profile::removeAvatar(const QString &ownerId)
bool Profile::exists(QString name) bool Profile::exists(QString name)
{ {
QString path = Settings::getInstance().getSettingsDirPath() + name; QString path = Settings::getInstance().getSettingsDirPath() + name;
return QFile::exists(path+".tox") && QFile::exists(path+".ini"); return QFile::exists(path+".tox");
} }
bool Profile::isEncrypted() const bool Profile::isEncrypted() const