Skip to content

fix retrieval of "this" object in ControllerEngine::beginTimer #1196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daschuer merged 1 commit into from
Feb 28, 2017
Merged

fix retrieval of "this" object in ControllerEngine::beginTimer #1196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions src/controllers/controllerengine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ QScriptValue ControllerEngine::wrapFunctionCode(const QString& codeSnippet,
return wrappedFunction;
}

QScriptValue ControllerEngine::getThisObjectInFunctionCall() {
QScriptContext *ctxt = m_pEngine->currentContext();
// Our current context is a function call. We want to grab the 'this'
// from the caller's context, so we walk up the stack.
if (ctxt) {
ctxt = ctxt->parentContext();
}
return ctxt ? ctxt->thisObject() : QScriptValue();
}

/* -------- ------------------------------------------------------
Purpose: Shuts down scripts in an orderly fashion
(stops timers then executes shutdown functions)
Expand Down Expand Up @@ -780,14 +790,7 @@ QScriptValue ControllerEngine::connectControl(
return QScriptValue(true);
}

QScriptContext *ctxt = m_pEngine->currentContext();
// Our current context is a function call to engine.connectControl. We
// want to grab the 'this' from the caller's context, so we walk up the
// stack.
if (ctxt) {
ctxt = ctxt->parentContext();
conn.context = ctxt ? ctxt->thisObject() : QScriptValue();
}
conn.context = getThisObjectInFunctionCall();

if (callback.isString()) {
conn.id = callback.toString();
Expand Down Expand Up @@ -971,8 +974,7 @@ int ControllerEngine::beginTimer(int interval, QScriptValue timerCallback,
int timerId = startTimer(interval);
TimerInfo info;
info.callback = timerCallback;
QScriptContext *ctxt = m_pEngine->currentContext();
info.context = ctxt ? ctxt->thisObject() : QScriptValue();
info.context = getThisObjectInFunctionCall();
info.oneShot = oneShot;
m_timers[timerId] = info;
if (timerId == 0) {
Expand Down
1 change: 1 addition & 0 deletions src/controllers/controllerengine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class ControllerEngine : public QObject {

// Wrap a snippet of JS code in an anonymous function
QScriptValue wrapFunctionCode(const QString& codeSnippet, int numberOfArgs);
QScriptValue getThisObjectInFunctionCall();

// Look up registered script function prefixes
const QList<QString>& getScriptFunctionPrefixes() { return m_scriptFunctionPrefixes; };
Expand Down