59 lines
2.5 KiB
Diff
59 lines
2.5 KiB
Diff
From f8ddcc8b9d0a53e9105bc42feb6f5d02561e207e Mon Sep 17 00:00:00 2001
|
|
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
|
Date: Thu, 18 Aug 2022 20:39:14 +0800
|
|
Subject: [PATCH 2/2] fix(account): The connection singleton in the signal slot
|
|
is not automatically disconnected because the receiver parameter is not
|
|
added, resulting in a crash
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 修复账户管理中信号槽中连接单例未加入接受者参数导致未自动断开，崩溃问题
|
|
|
|
Closes #I5HRYF
|
|
---
|
|
plugins/account/src/kiran-account-manager.cpp | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/plugins/account/src/kiran-account-manager.cpp b/plugins/account/src/kiran-account-manager.cpp
|
|
index 8602456..c21b8b9 100644
|
|
--- a/plugins/account/src/kiran-account-manager.cpp
|
|
+++ b/plugins/account/src/kiran-account-manager.cpp
|
|
@@ -359,7 +359,7 @@ void KiranAccountManager::initPageSelectAvatar()
|
|
void KiranAccountManager::initPageAuthManager()
|
|
{
|
|
//TODO:init auth manager page
|
|
- connect(m_page_authManager, &AuthManagerPage::sigReturn, [this]() {
|
|
+ connect(m_page_authManager, &AuthManagerPage::sigReturn, this,[this]() {
|
|
m_stackWidget->setCurrentIndex(PAGE_USER_INFO);
|
|
});
|
|
}
|
|
@@ -367,13 +367,13 @@ void KiranAccountManager::initPageAuthManager()
|
|
void KiranAccountManager::connectToInfoChanged()
|
|
{
|
|
//处理用户新增、删除
|
|
- connect(AccountsGlobalInfo::instance(), &AccountsGlobalInfo::UserAdded,
|
|
+ connect(AccountsGlobalInfo::instance(), &AccountsGlobalInfo::UserAdded,this,
|
|
[this](const QDBusObjectPath &obj) {
|
|
KLOG_INFO() << "siderbar add item:" << obj.path();
|
|
appendSiderbarItem(obj.path());
|
|
});
|
|
|
|
- connect(AccountsGlobalInfo::instance(), &AccountsGlobalInfo::UserDeleted,
|
|
+ connect(AccountsGlobalInfo::instance(), &AccountsGlobalInfo::UserDeleted,this,
|
|
[this](const QDBusObjectPath &obj) {
|
|
KLOG_INFO() << "siderbar delete item:" << obj.path();
|
|
int findIdx = -1;
|
|
@@ -402,7 +402,7 @@ void KiranAccountManager::connectToInfoChanged()
|
|
});
|
|
|
|
//处理用户属性变更
|
|
- connect(AccountsGlobalInfo::instance(), &AccountsGlobalInfo::UserPropertyChanged,
|
|
+ connect(AccountsGlobalInfo::instance(), &AccountsGlobalInfo::UserPropertyChanged,this,
|
|
[this](QString userPath, QString propertyName, QVariant value) {
|
|
//侧边栏
|
|
if ((propertyName == "locked") || (propertyName == "icon_file"))
|
|
--
|
|
2.36.1
|
|
|