Showing the changes to interface/src/Application.cpp (1 of 12 files). Show all
Unified · Split
| @@ -654,11 +654,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 653 unmodified lines | |||
| 654 | connect(nodeList.data(), &NodeList::nodeActivated, this, &Application::nodeActivated); | 654 | connect(nodeList.data(), &NodeList::nodeActivated, this, &Application::nodeActivated); |
| 655 | connect(nodeList.data(), &NodeList::uuidChanged, getMyAvatar(), &MyAvatar::setSessionUUID); | 655 | connect(nodeList.data(), &NodeList::uuidChanged, getMyAvatar(), &MyAvatar::setSessionUUID); |
| 656 | connect(nodeList.data(), &NodeList::uuidChanged, this, &Application::setSessionUUID); | 656 | connect(nodeList.data(), &NodeList::uuidChanged, this, &Application::setSessionUUID); |
| 657 | |||
| 658 | connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, this, &Application::limitOfSilentDomainCheckInsReached); | 657 | connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, this, &Application::limitOfSilentDomainCheckInsReached); |
| 659 | //connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, nodeList.data(), &NodeList::reset); | ||
| 660 | |||
| 661 | |||
| 662 | connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch); | 658 | connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch); |
| 663 | 659 | ||
| 664 | // connect to appropriate slots on AccountManager | 660 | // connect to appropriate slots on AccountManager |
| @@ -1069,16 +1065,11 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 404 unmodified lines | |||
| 1069 | } | 1065 | } |
| 1070 | 1066 | ||
| 1071 | void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCode) { | 1067 | void Application::domainConnectionRefused(const QString& reasonMessage, int reasonCode) { |
| 1072 | qDebug() << __FUNCTION__ << "message:" << reasonMessage << "code:" << reasonCode; | ||
| 1073 | qDebug() << __FUNCTION__ << "DomainHandler::ConnectionRefusedReason::ProtocolMismatch:" << (int)DomainHandler::ConnectionRefusedReason::ProtocolMismatch; | ||
| 1074 | |||
| 1075 | if (static_cast<DomainHandler::ConnectionRefusedReason>(reasonCode) == DomainHandler::ConnectionRefusedReason::ProtocolMismatch) { | 1068 | if (static_cast<DomainHandler::ConnectionRefusedReason>(reasonCode) == DomainHandler::ConnectionRefusedReason::ProtocolMismatch) { |
| 1076 | qDebug() << __FUNCTION__ << " PROTOCOL MISMATCH!!!"; | ||
| 1077 | notifyPacketVersionMismatch(); | 1069 | notifyPacketVersionMismatch(); |
| 1078 | } | 1070 | } |
| 1079 | } | 1071 | } |
| 1080 | 1072 | ||
| 1081 | |||
| 1082 | QString Application::getUserAgent() { | 1073 | QString Application::getUserAgent() { |
| 1083 | if (QThread::currentThread() != thread()) { | 1074 | if (QThread::currentThread() != thread()) { |
| 1084 | QString userAgent; | 1075 | QString userAgent; |
| @@ -4595,12 +4586,8 @@ void Application::setSessionUUID(const QUuid& sessionUUID) const { · 3510 unmodified lines | |||
| 4595 | // We won't actually complete the connection, but if the server responds, we know that it needs to be upgraded (or we | 4586 | // We won't actually complete the connection, but if the server responds, we know that it needs to be upgraded (or we |
| 4596 | // need to be downgraded to talk to it). | 4587 | // need to be downgraded to talk to it). |
| 4597 | void Application::limitOfSilentDomainCheckInsReached() { | 4588 | void Application::limitOfSilentDomainCheckInsReached() { |
| 4598 | //qDebug() << __FUNCTION__; | ||
| 4599 | |||
| 4600 | auto nodeList = DependencyManager::get<NodeList>(); | 4589 | auto nodeList = DependencyManager::get<NodeList>(); |
| 4601 | |||
| 4602 | nodeList->downgradeDomainServerCheckInVersion(); // attempt to use an older domain checkin version | 4590 | nodeList->downgradeDomainServerCheckInVersion(); // attempt to use an older domain checkin version |
| 4603 | |||
| 4604 | nodeList->reset(); | 4591 | nodeList->reset(); |
| 4605 | } | 4592 | } |
| 4606 | 4593 | ||