ThreadedAssignment calls virtual stop() upon domain disconnect

assignment-client/src/Agent.cpp

@@ -336,7 +336,6 @@ void Agent::scriptRequestFinished() {
         }
 
         setFinished(true);
-        ThreadedAssignment::aboutToFinish();
     }
 
     request->deleteLater();
@@ -499,7 +498,6 @@ void Agent::executeScript() {
     DependencyManager::destroy<RecordingScriptingInterface>();
 
     setFinished(true);
-    ThreadedAssignment::aboutToFinish();
 }
 
 QUuid Agent::getSessionUUID() const {
@@ -827,14 +825,6 @@ void Agent::processAgentAvatarAudio() {
 void Agent::aboutToFinish() {
     setIsAvatar(false);// will stop timers for sending identity packets
 
-    // If script engine not started yet then finish up, else will be done when
-    // script engine exits.
-    if (_scriptEngine) {
-        _scriptEngine->stop();
-    } else {
-        ThreadedAssignment::aboutToFinish();
-    }
-
     // our entity tree is going to go away so tell that to the EntityScriptingInterface
     DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr);
 
@@ -864,3 +854,9 @@ void Agent::aboutToFinish() {
         _encoder = nullptr;
     }
 }
+
+void Agent::stop() {
+    if (_scriptEngine) {
+        _scriptEngine->stop();
+    }
+}

assignment-client/src/Agent.h

@@ -97,6 +97,12 @@ public slots:
      */
     bool isAvatar() const { return _isAvatar; }
 
+    /**jsdoc
+    * @function Agent.stop
+    * @deprecated This function is being removed from the API.
+    */
+    Q_INVOKABLE virtual void stop() override;
+
 private slots:
     void requestScript();
     void scriptRequestFinished();

assignment-client/src/audio/AudioMixer.cpp

@@ -109,7 +109,6 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
 
 void AudioMixer::aboutToFinish() {
     DependencyManager::destroy<PluginManager>();
-    ThreadedAssignment::aboutToFinish();
 }
 
 void AudioMixer::queueAudioPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {

assignment-client/src/entities/EntityServer.cpp

@@ -72,7 +72,6 @@ void EntityServer::aboutToFinish() {
     DependencyManager::get<ResourceManager>()->cleanup();
 
     OctreeServer::aboutToFinish();
-    ThreadedAssignment::aboutToFinish();
 }
 
 void EntityServer::handleEntityPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer senderNode) {

assignment-client/src/scripts/EntityScriptServer.cpp

@@ -587,6 +587,4 @@ void EntityScriptServer::aboutToFinish() {
         _codec->releaseEncoder(_encoder);
         _encoder = nullptr;
     }
-
-    ThreadedAssignment::aboutToFinish();
 }

libraries/networking/src/ThreadedAssignment.cpp

@@ -66,6 +66,8 @@ void ThreadedAssignment::setFinished(bool isFinished) {
 
             // call our virtual aboutToFinish method - this gives the ThreadedAssignment subclass a chance to cleanup
             aboutToFinish();
+
+            emit finished();
         }
     }
 }
@@ -118,7 +120,7 @@ void ThreadedAssignment::checkInWithDomainServerOrExit() {
     if (_numQueuedCheckIns >= MAX_SILENT_DOMAIN_SERVER_CHECK_INS) {
         qCDebug(networking) << "At least" << MAX_SILENT_DOMAIN_SERVER_CHECK_INS << "have been queued without a response from domain-server"
             << "Stopping the current assignment";
-        setFinished(true);
+        stop();
     } else {
         auto nodeList = DependencyManager::get<NodeList>();
         QMetaObject::invokeMethod(nodeList.data(), "sendDomainServerCheckIn");
@@ -130,5 +132,5 @@ void ThreadedAssignment::checkInWithDomainServerOrExit() {
 
 void ThreadedAssignment::domainSettingsRequestFailed() {
     qCDebug(networking) << "Failed to retreive settings object from domain-server. Bailing on assignment.";
-    setFinished(true);
+    stop();
 }

libraries/networking/src/ThreadedAssignment.h

@@ -25,7 +25,7 @@ public:
     ~ThreadedAssignment() { stop(); }
 
     void setFinished(bool isFinished);
-    virtual void aboutToFinish() { emit finished(); };
+    virtual void aboutToFinish() { };
     void addPacketStatsAndSendStatsPacket(QJsonObject statsObject);
 
 public slots: