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
219 if (portStr) {219 if (portStr) {
220 listenPort = atoi(portStr);220 listenPort = atoi(portStr);
221 }221 }
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();
222 226
223 // start the nodeThread so its event loop is running227 // start the nodeThread so its event loop is running
224 _nodeThread->start();228 _nodeThread->start();
@@ -418,11 +422,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 193 unmodified lines
418 connect(_window, &MainWindow::windowGeometryChanged,422 connect(_window, &MainWindow::windowGeometryChanged,
419 _runningScriptsWidget, &RunningScriptsWidget::setBoundary);423 _runningScriptsWidget, &RunningScriptsWidget::setBoundary);
420 424
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
426 _trayIcon->show();425 _trayIcon->show();
427 426
428#ifdef HAVE_RTMIDI427#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