Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:10:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

more hacking

Browse source
This commit is contained in:
ZappoMan 2015-02-20 18:42:02 -08:00
parent 8c4474b2d0
commit e3de994c4a
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities-renderer/src/EntityTreeRenderer.cpp
View file

@ -61,8 +61,12 @@ EntityTreeRenderer::EntityTreeRenderer(bool wantScripts, AbstractViewStateInterf
EntityTreeRenderer::~EntityTreeRenderer() { EntityTreeRenderer::~EntityTreeRenderer() {
// NOTE: we don't need to delete _entitiesScriptEngine because it's owned by the application and gets cleaned up // NOTE: we don't need to delete _entitiesScriptEngine because it's owned by the application and gets cleaned up
// automatically but we do need to delete our sandbox script engine. // automatically but we do need to delete our sandbox script engine.
delete _sandboxScriptEngine;
_sandboxScriptEngine = NULL; if (_sandboxScriptEngine) {
qDebug() << "EntityTreeRenderer::~EntityTreeRenderer() delete _sandboxScriptEngine!!!!!";
delete _sandboxScriptEngine;
_sandboxScriptEngine = NULL;
}
} }
void EntityTreeRenderer::clear() { void EntityTreeRenderer::clear() {

3
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -109,7 +109,7 @@ void ScriptEngine::gracefullyStopAllScripts(QObject* application) {
qDebug() << "[" << QThread::currentThread() << "]" << "ScriptEngine::gracefullyStopAllScripts() ----------- START ------------------"; qDebug() << "[" << QThread::currentThread() << "]" << "ScriptEngine::gracefullyStopAllScripts() ----------- START ------------------";
QSetIterator<ScriptEngine*> i(_allKnownScriptEngines); QMutableSetIterator<ScriptEngine*> i(_allKnownScriptEngines);
while (i.hasNext()) { while (i.hasNext()) {
ScriptEngine* scriptEngine = i.next(); ScriptEngine* scriptEngine = i.next();
qDebug() << (void*)scriptEngine; qDebug() << (void*)scriptEngine;
@ -121,7 +121,6 @@ void ScriptEngine::gracefullyStopAllScripts(QObject* application) {
QObject::connect(scriptEngine, &ScriptEngine::doneRunning, &loop, &QEventLoop::quit); QObject::connect(scriptEngine, &ScriptEngine::doneRunning, &loop, &QEventLoop::quit);
scriptEngine->disconnect(application); scriptEngine->disconnect(application);
scriptEngine->stop(); scriptEngine->stop();
qDebug() << "waiting on script to stop... "; qDebug() << "waiting on script to stop... ";