Showing the changes to interface/src/Application.cpp (1 of 2 files). Show all
Unified · Split
| @@ -2653,6 +2653,8 @@ void Application::loadSettings() { · 2652 unmodified lines | ||
| 2653 | 2653 | |
| 2654 | 2654 | Menu::getInstance()->loadSettings(); |
| 2655 | 2655 | getMyAvatar()->loadData(); |
| 2656 | + | |
| 2657 | + _settingsLoaded = true; | |
| 2656 | 2658 | } |
| 2657 | 2659 | |
| 2658 | 2660 | void Application::saveSettings() { |
| @@ -3276,6 +3278,10 @@ int Application::sendNackPackets() { · 617 unmodified lines | ||
| 3276 | 3278 | |
| 3277 | 3279 | void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) { |
| 3278 | 3280 | |
| 3281 | + if (!_settingsLoaded) { | |
| 3282 | + return; // bail early if settings are not loaded | |
| 3283 | + } | |
| 3284 | + | |
| 3279 | 3285 | //qCDebug(interfaceapp) << ">>> inside... queryOctree()... _viewFrustum.getFieldOfView()=" << _viewFrustum.getFieldOfView(); |
| 3280 | 3286 | bool wantExtraDebugging = getLogger()->extraDebugging(); |
| 3281 | 3287 | |