openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix:1)it will crash,when it's name is changed. 

2)it will not change name, when it's name is cahnged.
This commit is contained in:
renpeijia 2021-09-30 14:48:42 +08:00
parent 112572cc4d
commit 9e5a79fcf3
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/frontend/tab-pages/lanpage.cpp
View File

@ -851,7 +851,7 @@ void LanPage::sendLanAddSignal(KyConnectItem *p_connectItem)
return;
}
void LanPage::updateConnectionProperty(KyConnectItem *p_connectItem)
void LanPage::updateConnectionProperty(KyConnectItem *p_connectItem, bool &needDeleteItem)
{
QMap<KyConnectItem *, QListWidgetItem *>::iterator iter;
for (iter = m_deactiveMap.begin(); iter != m_deactiveMap.constEnd(); ++iter) {
@ -889,17 +889,17 @@ void LanPage::updateConnectionProperty(KyConnectItem *p_connectItem)
QListWidgetItem *p_listWidgetItem = addNewItem(p_connectItem, m_inactivatedLanListWidget);
m_deactiveMap.insert(p_connectItem, p_listWidgetItem);
p_connectItem = nullptr;
needDeleteItem = false;
}
}
}
break;
break;
}
}
return;
}
void LanPage::updateActiveConnectionProperty(KyConnectItem *p_connectItem)
void LanPage::updateActiveConnectionProperty(KyConnectItem *p_connectItem, bool &needDeleteItem)
{
QMap<KyConnectItem *, QListWidgetItem *>::iterator iters;
for (iters = m_activeMap.begin(); iters != m_activeMap.constEnd(); ++iters) {
@ -935,7 +935,7 @@ void LanPage::updateActiveConnectionProperty(KyConnectItem *p_connectItem)
QListWidgetItem *p_listWidgetItem = addNewItem(p_connectItem, m_activatedLanListWidget);
m_activeMap.insert(p_connectItem, p_listWidgetItem);
p_connectItem = nullptr;
needDeleteItem = false;
}
}
break;
@ -952,9 +952,10 @@ void LanPage::onUpdateConnection(QString uuid)
return;
}
qDebug() << "[LanPage]:Connection Changed !" << Q_FUNC_INFO << __LINE__;
qDebug() << "[LanPage]:Connection property Changed." << Q_FUNC_INFO << __LINE__;
KyConnectItem *p_newItem = nullptr;
bool needDeleteNewItem = true;
if (m_connectResourse->isActivatedConnection(uuid)) {
p_newItem = m_activeResourse->getActiveConnectionByUuid(uuid);
if (nullptr == p_newItem) {
@ -964,7 +965,7 @@ void LanPage::onUpdateConnection(QString uuid)
}
sendLanUpdateSignal(p_newItem);
updateActiveConnectionProperty(p_newItem);
updateActiveConnectionProperty(p_newItem, needDeleteNewItem);
} else {
p_newItem = m_connectResourse->getConnectionItemByUuid(uuid);
if (nullptr == p_newItem) {
@ -974,10 +975,11 @@ void LanPage::onUpdateConnection(QString uuid)
}
sendLanUpdateSignal(p_newItem);
updateConnectionProperty(p_newItem);
updateConnectionProperty(p_newItem, needDeleteNewItem);
}
if (p_newItem != nullptr) {
if (needDeleteNewItem) {
qDebug()<<"[LanPage] the new item is not used, so is deleted.";
delete p_newItem;
p_newItem = nullptr;
}

4
src/frontend/tab-pages/lanpage.h
View File

@ -55,8 +55,8 @@ private:
void updateConnectionArea(QString uuid);
void updateActivatedConnectionArea(QString uuid);
void updateActiveConnectionProperty(KyConnectItem *p_connectItem);
void updateConnectionProperty(KyConnectItem *p_connectItem);
void updateActiveConnectionProperty(KyConnectItem *p_connectItem, bool &needDeleteItem);
void updateConnectionProperty(KyConnectItem *p_connectItem, bool &needDeleteItem);
void sendLanUpdateSignal(KyConnectItem *p_connectItem);
void sendLanAddSignal(KyConnectItem *p_connectItem);