Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -754,7 +754,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 753 unmodified lines | ||
| 754 | 754 | connect(&nodeList->getPacketReceiver(), &PacketReceiver::dataReceived, |
| 755 | 755 | bandwidthRecorder.data(), &BandwidthRecorder::updateInboundData); |
| 756 | 756 | |
| 757 | − connect(&getMyAvatar()->getSkeletonModel(), &SkeletonModel::skeletonLoaded, | |
| 757 | + // FIXME -- I'm a little concerned about this. | |
| 758 | + connect(getMyAvatar()->getSkeletonModel().get(), &SkeletonModel::skeletonLoaded, | |
| 758 | 759 | this, &Application::checkSkeleton, Qt::QueuedConnection); |
| 759 | 760 | |
| 760 | 761 | // Setup the userInputMapper with the actions |
| @@ -4595,7 +4596,7 @@ void Application::notifyPacketVersionMismatch() { · 3834 unmodified lines | ||
| 4595 | 4596 | } |
| 4596 | 4597 | |
| 4597 | 4598 | void Application::checkSkeleton() { |
| 4598 | − if (getMyAvatar()->getSkeletonModel().isActive() && !getMyAvatar()->getSkeletonModel().hasSkeleton()) { | |
| 4599 | + if (getMyAvatar()->getSkeletonModel()->isActive() && !getMyAvatar()->getSkeletonModel()->hasSkeleton()) { | |
| 4599 | 4600 | qCDebug(interfaceapp) << "MyAvatar model has no skeleton"; |
| 4600 | 4601 | |
| 4601 | 4602 | QString message = "Your selected avatar body has no skeleton.\n\nThe default body will be loaded..."; |