From ac8d947cb1d38db06b92b00cfc29517b75381c23 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Wed, 22 Oct 2014 15:18:49 -0700
Subject: [PATCH] Update ScriptUndoCommand to run on ScriptEngine thread

---
 .../src/UndoStackScriptingInterface.cpp       | 20 +++++++++++++++----
 .../src/UndoStackScriptingInterface.h         |  7 ++++++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/libraries/script-engine/src/UndoStackScriptingInterface.cpp b/libraries/script-engine/src/UndoStackScriptingInterface.cpp
index 42efe99c92..ed0f4d563d 100644
--- a/libraries/script-engine/src/UndoStackScriptingInterface.cpp
+++ b/libraries/script-engine/src/UndoStackScriptingInterface.cpp
@@ -10,6 +10,7 @@
 //
 
 #include <QDebug>
+#include <QScriptValue>
 #include <QScriptValueList>
 #include <QScriptEngine>
 
@@ -20,9 +21,11 @@ UndoStackScriptingInterface::UndoStackScriptingInterface(QUndoStack* undoStack)
 
 void UndoStackScriptingInterface::pushCommand(QScriptValue undoFunction, QScriptValue undoData,
                                               QScriptValue redoFunction, QScriptValue redoData) {
-    ScriptUndoCommand* undoCommand = new ScriptUndoCommand(undoFunction, undoData, redoFunction, redoData);
-    qDebug() << "Pushing command";
-    _undoStack->push(undoCommand);
+    if (undoFunction.engine()) {
+        ScriptUndoCommand* undoCommand = new ScriptUndoCommand(undoFunction, undoData, redoFunction, redoData);
+        undoCommand->moveToThread(undoFunction.engine()->thread());
+        _undoStack->push(undoCommand);
+    }
 }
 
 ScriptUndoCommand::ScriptUndoCommand(QScriptValue undoFunction, QScriptValue undoData,
@@ -34,12 +37,21 @@ ScriptUndoCommand::ScriptUndoCommand(QScriptValue undoFunction, QScriptValue und
 }
 
 void ScriptUndoCommand::undo() {
+    QMetaObject::invokeMethod(this, "doUndo");
+}
+
+void ScriptUndoCommand::redo() {
+    QMetaObject::invokeMethod(this, "doRedo");
+}
+
+void ScriptUndoCommand::doUndo() {
     QScriptValueList args;
     args << _undoData;
     _undoFunction.call(QScriptValue(), args);
 }
 
-void ScriptUndoCommand::redo() {
+
+void ScriptUndoCommand::doRedo() {
     QScriptValueList args;
     args << _redoData;
     _redoFunction.call(QScriptValue(), args);
diff --git a/libraries/script-engine/src/UndoStackScriptingInterface.h b/libraries/script-engine/src/UndoStackScriptingInterface.h
index 9ab822ff80..835e5dfff4 100644
--- a/libraries/script-engine/src/UndoStackScriptingInterface.h
+++ b/libraries/script-engine/src/UndoStackScriptingInterface.h
@@ -28,7 +28,8 @@ private:
     QUndoStack* _undoStack;
 };
 
-class ScriptUndoCommand : public QUndoCommand {
+class ScriptUndoCommand : public QObject, public QUndoCommand {
+    Q_OBJECT
 public:
     ScriptUndoCommand(QScriptValue undoFunction, QScriptValue undoData, QScriptValue redoFunction, QScriptValue redoData);
 
@@ -37,6 +38,10 @@ public:
     virtual bool mergeWith(const QUndoCommand* command) { return false; }
     virtual int id() const { return -1; }
 
+public slots:
+    void doUndo();
+    void doRedo();
+
 private:
     QScriptValue _undoFunction;
     QScriptValue _undoData;