Browse Source

fix(UI): prevent deadlocks on logout and profile delete

fixes #4896
pull/4897/head
sudden6 8 years ago
parent
commit
a49e34589f
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
  1. 4
      src/model/profile/profileinfo.cpp

4
src/model/profile/profileinfo.cpp

@ -217,7 +217,7 @@ IProfileInfo::SaveResult ProfileInfo::exportProfile(const QString &path) const
QVector<QString> ProfileInfo::removeProfile() QVector<QString> ProfileInfo::removeProfile()
{ {
QVector<QString> manualDeleteFiles = profile->remove(); QVector<QString> manualDeleteFiles = profile->remove();
QMetaObject::invokeMethod(&Nexus::getInstance(), "showLogin", Qt::BlockingQueuedConnection); QMetaObject::invokeMethod(&Nexus::getInstance(), "showLogin");
return manualDeleteFiles; return manualDeleteFiles;
} }
@ -227,7 +227,7 @@ QVector<QString> ProfileInfo::removeProfile()
void ProfileInfo::logout() void ProfileInfo::logout()
{ {
Settings::getInstance().saveGlobal(); Settings::getInstance().saveGlobal();
QMetaObject::invokeMethod(&Nexus::getInstance(), "showLogin", Qt::BlockingQueuedConnection); QMetaObject::invokeMethod(&Nexus::getInstance(), "showLogin");
} }
/** /**

Loading…
Cancel
Save