diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvirc/sparser/kvi_sp_numeric.cpp | 6 | ||||
| -rw-r--r-- | src/modules/options/optw_servers.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index a05774ced..cbcca692d 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -2049,6 +2049,12 @@ void KviServerParser::parseNumericStartTls(KviIrcMessage * msg) bEnable = true; break; case 671: + if(msg->connection()->context()->state() == KviIrcContext::Connected) + { + //some servers use this same numeric to indicate RPL_WHOISSECURE + parseNumericWhoisOther(msg); + return; + } debug("STARTTLS FAIL"); bEnable = false; break; diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index cb7303351..affe8ebb1 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -1645,7 +1645,6 @@ void KviServerOptionsWidget::removeCurrent() if(m_pLastEditedItem) { QTreeWidgetItem * it = m_pTreeWidget->itemAbove(m_pLastEditedItem); - if(!it)it = m_pTreeWidget->topLevelItemCount()>0 ? m_pTreeWidget->itemBelow(m_pLastEditedItem) : m_pTreeWidget->itemBelow(m_pLastEditedItem); int index = m_pTreeWidget->indexOfTopLevelItem(m_pLastEditedItem); if(index > -1) |