Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 21:26:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3451 from birarda/fix-ssl-handshake-race

Browse source 
make sure the OAuthWebViewHandler is ready before the NodeList might need it
This commit is contained in:
Brad Hefta-Gaub 2014-09-18 13:29:54 -07:00
commit c48b3ae51e
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -219,6 +219,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
if (portStr) { if (portStr) {
listenPort = atoi(portStr); listenPort = atoi(portStr);
} }
// call the OAuthWebviewHandler static getter so that its instance lives in our thread
// make sure it is ready before the NodeList might need it
OAuthWebViewHandler::getInstance();
// start the nodeThread so its event loop is running // start the nodeThread so its event loop is running
_nodeThread->start(); _nodeThread->start();
@ -418,11 +422,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
connect(_window, &MainWindow::windowGeometryChanged, connect(_window, &MainWindow::windowGeometryChanged,
_runningScriptsWidget, &RunningScriptsWidget::setBoundary); _runningScriptsWidget, &RunningScriptsWidget::setBoundary);
// call the OAuthWebviewHandler static getter so that its instance lives in our thread
OAuthWebViewHandler::getInstance();
// make sure the High Fidelity root CA is in our list of trusted certs
OAuthWebViewHandler::addHighFidelityRootCAToSSLConfig();
_trayIcon->show(); _trayIcon->show();
#ifdef HAVE_RTMIDI #ifdef HAVE_RTMIDI

2
interface/src/ui/OAuthWebViewHandler.cpp
View file

@ -27,7 +27,7 @@ OAuthWebViewHandler::OAuthWebViewHandler() :
_webViewRedisplayTimer(), _webViewRedisplayTimer(),
_lastAuthorizationURL() _lastAuthorizationURL()
{ {
addHighFidelityRootCAToSSLConfig();
} }
const char HIGH_FIDELITY_CA[] = "-----BEGIN CERTIFICATE-----\n" const char HIGH_FIDELITY_CA[] = "-----BEGIN CERTIFICATE-----\n"