From 438e5bd235ccc01f9be457e388c0e482d686c424 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 21 Mar 2014 15:46:06 -0700 Subject: [PATCH] fix crash on domain restart in Agent, also have Agent properly shutdown on call to Script.stop() --- assignment-client/src/Agent.cpp | 5 +++++ assignment-client/src/Agent.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp index 4eb6b17260..d32d6a3fd7 100644 --- a/assignment-client/src/Agent.cpp +++ b/assignment-client/src/Agent.cpp @@ -189,4 +189,9 @@ void Agent::run() { _scriptEngine.setScriptContents(scriptContents); _scriptEngine.run(); + setFinished(true); +} + +void Agent::aboutToFinish() { + _scriptEngine.stop(); } diff --git a/assignment-client/src/Agent.h b/assignment-client/src/Agent.h index b638c39356..0a61bd73f7 100644 --- a/assignment-client/src/Agent.h +++ b/assignment-client/src/Agent.h @@ -41,6 +41,8 @@ public: bool isListeningToAudioStream() const { return _scriptEngine.isListeningToAudioStream(); } void setIsListeningToAudioStream(bool isListeningToAudioStream) { _scriptEngine.setIsListeningToAudioStream(isListeningToAudioStream); } + + virtual void aboutToFinish(); public slots: void run();