History

fix simulation ownership infection

Andrew Meadows committed 11 years ago

Commit 0a102571 parent 42ec39c4 files · +22 −30Browse files

Showing the changes to interface/src/Application.cpp (1 of 4 files). Show all

Unified · Split

interface/src/Application.cpp+5−0
@@ -432,6 +432,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 431 unmodified lines
432 connect(nodeList.data(), &NodeList::nodeKilled, this, &Application::nodeKilled);432 connect(nodeList.data(), &NodeList::nodeKilled, this, &Application::nodeKilled);
433 connect(nodeList.data(), SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));433 connect(nodeList.data(), SIGNAL(nodeKilled(SharedNodePointer)), SLOT(nodeKilled(SharedNodePointer)));
434 connect(nodeList.data(), &NodeList::uuidChanged, _myAvatar, &MyAvatar::setSessionUUID);434 connect(nodeList.data(), &NodeList::uuidChanged, _myAvatar, &MyAvatar::setSessionUUID);
435 connect(nodeList.data(), &NodeList::uuidChanged, this, &Application::setSessionUUID);
435 connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, nodeList.data(), &NodeList::reset);436 connect(nodeList.data(), &NodeList::limitOfSilentDomainCheckInsReached, nodeList.data(), &NodeList::reset);
436 connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch);437 connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &Application::notifyPacketVersionMismatch);
437 438
@@ -3870,6 +3871,9 @@ bool Application::acceptURL(const QString& urlString) { · 3432 unmodified lines
3870 return false;3871 return false;
3871}3872}
3872 3873
3874void Application::setSessionUUID(const QUuid& sessionUUID) {
3875 _physicsEngine.setSessionUUID(sessionUUID);
3876}
3873 3877
3874bool Application::askToSetAvatarUrl(const QString& url) {3878bool Application::askToSetAvatarUrl(const QString& url) {
3875 QUrl realUrl(url);3879 QUrl realUrl(url);
@@ -4482,3 +4486,4 @@ void Application::friendsWindowClosed() { · 606 unmodified lines
4482void Application::postLambdaEvent(std::function<void()> f) {4486void Application::postLambdaEvent(std::function<void()> f) {
4483 QCoreApplication::postEvent(this, new LambdaEvent(f));4487 QCoreApplication::postEvent(this, new LambdaEvent(f));
4484}4488}
4489