History

Merge branch 'master' of https://github.com/highfidelity/hifi into deference

Andrzej Kapolka committed 12 years ago

Commit 08fda3b2 parents e356b06 76f78e723 files · +184 −97Browse files

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

Unified · Split

interface/src/Application.cpp+4−5
@@ -219,6 +219,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 218 unmodified lines
219219 if (portStr) {
220220 listenPort = atoi(portStr);
221221 }
222+
223+ // call the OAuthWebviewHandler static getter so that its instance lives in our thread
224+ // make sure it is ready before the NodeList might need it
225+ OAuthWebViewHandler::getInstance();
222226
223227 // start the nodeThread so its event loop is running
224228 _nodeThread->start();
@@ -418,11 +422,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 193 unmodified lines
418422 connect(_window, &MainWindow::windowGeometryChanged,
419423 _runningScriptsWidget, &RunningScriptsWidget::setBoundary);
420424
421− // call the OAuthWebviewHandler static getter so that its instance lives in our thread
422− OAuthWebViewHandler::getInstance();
423− // make sure the High Fidelity root CA is in our list of trusted certs
424− OAuthWebViewHandler::addHighFidelityRootCAToSSLConfig();
425−
426425 _trayIcon->show();
427426
428427 #ifdef HAVE_RTMIDI

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t