Showing the changes to interface/src/Application.cpp (1 of 7 files). Show all
Unified · Split
| @@ -630,8 +630,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 629 unmodified lines | ||
| 630 | 630 | connect(&domainHandler, SIGNAL(connectedToDomain(const QString&)), SLOT(updateWindowTitle())); |
| 631 | 631 | connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(updateWindowTitle())); |
| 632 | 632 | connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails())); |
| 633 | − | |
| 634 | 633 | connect(&domainHandler, &DomainHandler::resetting, nodeList.data(), &NodeList::resetDomainServerCheckInVersion); |
| 634 | + connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &Application::domainConnectionRefused); | |
| 635 | 635 | |
| 636 | 636 | // update our location every 5 seconds in the metaverse server, assuming that we are authenticated with one |
| 637 | 637 | const qint64 DATA_SERVER_LOCATION_CHANGE_UPDATE_MSECS = 5 * MSECS_PER_SECOND; |
| @@ -1068,6 +1068,17 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 430 unmodified lines | ||
| 1068 | 1068 | firstRun.set(false); |
| 1069 | 1069 | } |
| 1070 | 1070 | |
| 1071 | +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) { | |
| 1076 | + qDebug() << __FUNCTION__ << " PROTOCOL MISMATCH!!!"; | |
| 1077 | + notifyPacketVersionMismatch(); | |
| 1078 | + } | |
| 1079 | +} | |
| 1080 | + | |
| 1081 | + | |
| 1071 | 1082 | QString Application::getUserAgent() { |
| 1072 | 1083 | if (QThread::currentThread() != thread()) { |
| 1073 | 1084 | QString userAgent; |