History

Merge pull request #4521 from ctrlaltdavid/20416

CR for Job #20416 - Update notification.js to include a notification about being blocked from a server

Philip Rosedale committed 11 years ago

Commit 099a2b52 parents d17c3c0 90c1da26 files · +27 −2Browse files

Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Application.cpp+10−1
@@ -297,7 +297,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 296 unmodified lines
297 _lastSendDownstreamAudioStats(usecTimestampNow()),297 _lastSendDownstreamAudioStats(usecTimestampNow()),
298 _isVSyncOn(true),298 _isVSyncOn(true),
299 _aboutToQuit(false),299 _aboutToQuit(false),
300 _notifiedPacketVersionMismatchThisDomain(false)300 _notifiedPacketVersionMismatchThisDomain(false),
301 _domainConnectionRefusals(QList<QString>())
301{302{
302#ifdef Q_OS_WIN303#ifdef Q_OS_WIN
303 installNativeEventFilter(&MyNativeEventFilter::getInstance());304 installNativeEventFilter(&MyNativeEventFilter::getInstance());
@@ -3278,6 +3279,14 @@ void Application::clearDomainOctreeDetails() { · 2974 unmodified lines
3278void Application::domainChanged(const QString& domainHostname) {3279void Application::domainChanged(const QString& domainHostname) {
3279 updateWindowTitle();3280 updateWindowTitle();
3280 clearDomainOctreeDetails();3281 clearDomainOctreeDetails();
3282 _domainConnectionRefusals.clear();
3283}
3284
3285void Application::domainConnectionDenied(const QString& reason) {
3286 if (!_domainConnectionRefusals.contains(reason)) {
3287 _domainConnectionRefusals.append(reason);
3288 emit domainConnectionRefused(reason);
3289 }
3281}3290}
3282 3291
3283void Application::connectedToDomain(const QString& hostname) {3292void Application::connectedToDomain(const QString& hostname) {