History

making requested changes and fixing compile issue for jenkins

Dante Ruiz committed 8 years ago

Commit c97d6461 parent b665dbe6 files · +7 −22Browse files

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

Unified · Split

interface/src/ConnectionMonitor.cpp+5−5
@@ -21,8 +21,8 @@ · 20 unmodified lines
2121
2222 // Because the connection monitor is created at startup, the time we wait on initial load
2323 // should be longer to allow the application to initialize.
24−static const int ON_INITIAL_LOAD_DISPLAY_AFTER_DISCONNECTED_FOR_X_MS = 10000;
25−static const int DISPLAY_AFTER_DISCONNECTED_FOR_X_MS = 5000;
24+static const int ON_INITIAL_LOAD_REDIRECT_AFTER_DISCONNECTED_FOR_X_MS = 10000;
25+static const int REDIRECT_AFTER_DISCONNECTED_FOR_X_MS = 5000;
2626 static const QString ERROR_DOMAIN_URL = "file:///~/serverless/redirect.json";
2727
2828 void ConnectionMonitor::init() {
@@ -36,17 +36,17 @@ void ConnectionMonitor::init() { · 7 unmodified lines
3636
3737 _timer.setSingleShot(true);
3838 if (!domainHandler.isConnected()) {
39− _timer.start(ON_INITIAL_LOAD_DISPLAY_AFTER_DISCONNECTED_FOR_X_MS);
39+ _timer.start(ON_INITIAL_LOAD_REDIRECT_AFTER_DISCONNECTED_FOR_X_MS);
4040 }
4141
4242 connect(&_timer, &QTimer::timeout, this, []() {
43− qDebug() << "ConnectionMonitor: Showing connection failure window";
43+ qDebug() << "ConnectionMonitor: Redirecting to 404 error domain";
4444 qApp->goToErrorDomainURL(REDIRECT_HIFI_ADDRESS);
4545 });
4646 }
4747
4848 void ConnectionMonitor::startTimer() {
49− _timer.start(DISPLAY_AFTER_DISCONNECTED_FOR_X_MS);
49+ _timer.start(REDIRECT_AFTER_DISCONNECTED_FOR_X_MS);
5050 }
5151
5252 void ConnectionMonitor::stopTimer() {