Showing the changes to interface/src/Application.cpp (1 of 8 files). Show all
Unified · Split
| @@ -90,7 +90,6 @@ · 89 unmodified lines | |||
| 90 | #include "scripting/WindowScriptingInterface.h" | 90 | #include "scripting/WindowScriptingInterface.h" |
| 91 | 91 | ||
| 92 | #include "ui/InfoView.h" | 92 | #include "ui/InfoView.h" |
| 93 | #include "ui/OAuthWebViewHandler.h" | ||
| 94 | #include "ui/Snapshot.h" | 93 | #include "ui/Snapshot.h" |
| 95 | #include "ui/Stats.h" | 94 | #include "ui/Stats.h" |
| 96 | #include "ui/TextRenderer.h" | 95 | #include "ui/TextRenderer.h" |
| @@ -219,10 +218,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 122 unmodified lines | |||
| 219 | listenPort = atoi(portStr); | 218 | listenPort = atoi(portStr); |
| 220 | } | 219 | } |
| 221 | 220 | ||
| 222 | // call the OAuthWebviewHandler static getter so that its instance lives in our thread | ||
| 223 | // make sure it is ready before the NodeList might need it | ||
| 224 | OAuthWebViewHandler::getInstance(); | ||
| 225 | |||
| 226 | // start the nodeThread so its event loop is running | 221 | // start the nodeThread so its event loop is running |
| 227 | _nodeThread->start(); | 222 | _nodeThread->start(); |
| 228 | 223 | ||
| @@ -3522,9 +3517,6 @@ void Application::domainChanged(const QString& domainHostname) { · 3293 unmodified lines | |||
| 3522 | 3517 | ||
| 3523 | // reset the voxels renderer | 3518 | // reset the voxels renderer |
| 3524 | _voxels.killLocalVoxels(); | 3519 | _voxels.killLocalVoxels(); |
| 3525 | |||
| 3526 | // reset the auth URL for OAuth web view handler | ||
| 3527 | OAuthWebViewHandler::getInstance().clearLastAuthorizationURL(); | ||
| 3528 | } | 3520 | } |
| 3529 | 3521 | ||
| 3530 | void Application::connectedToDomain(const QString& hostname) { | 3522 | void Application::connectedToDomain(const QString& hostname) { |