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 #4677

Browse Source 
anthony.bilinski (1):
      fix(logout): Synchronously call showLogin to avoid multiple deletion
This commit is contained in:
Diadlo 2017-11-01 12:51:53 +03:00
commit 4af90a7f97
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
3 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/model/profile/profileinfo.cpp
View File

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

9
src/nexus.cpp
View File

@ -338,15 +338,6 @@ bool Nexus::tryRemoveFile(const QString& filepath)
return writable;
}
/**
* @brief Calls showLogin asynchronously, so we can safely logout from within the main GUI
*/
void Nexus::showLoginLater()
{
GUI::setEnabled(false);
QMetaObject::invokeMethod(&getInstance(), "showLogin", Qt::QueuedConnection);
}
void Nexus::onLastWindowClosed()
{
if (quitOnLastWindowClosed)

1
src/nexus.h
View File

@ -57,7 +57,6 @@ public:
public slots:
void showLogin();
void showLoginLater();
#ifdef Q_OS_MAC
public: