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
297297 _lastSendDownstreamAudioStats(usecTimestampNow()),
298298 _isVSyncOn(true),
299299 _aboutToQuit(false),
300− _notifiedPacketVersionMismatchThisDomain(false)
300+ _notifiedPacketVersionMismatchThisDomain(false),
301+ _domainConnectionRefusals(QList<QString>())
301302 {
302303 #ifdef Q_OS_WIN
303304 installNativeEventFilter(&MyNativeEventFilter::getInstance());
@@ -3278,6 +3279,14 @@ void Application::clearDomainOctreeDetails() { · 2974 unmodified lines
32783279 void Application::domainChanged(const QString& domainHostname) {
32793280 updateWindowTitle();
32803281 clearDomainOctreeDetails();
3282+ _domainConnectionRefusals.clear();
3283+}
3284+
3285+void Application::domainConnectionDenied(const QString& reason) {
3286+ if (!_domainConnectionRefusals.contains(reason)) {
3287+ _domainConnectionRefusals.append(reason);
3288+ emit domainConnectionRefused(reason);
3289+ }
32813290 }
32823291
32833292 void Application::connectedToDomain(const QString& hostname) {