Showing the changes to libraries/script-engine/src/qtscript/ScriptContextQtWrapper.cpp (1 of 14 files). Show all
Unified · Split
| @@ -52,7 +52,7 @@ ScriptFunctionContextPointer ScriptContextQtWrapper::functionContext() const { · 51 unmodified lines | |||
| 52 | 52 | ||
| 53 | ScriptContextPointer ScriptContextQtWrapper::parentContext() const { | 53 | ScriptContextPointer ScriptContextQtWrapper::parentContext() const { |
| 54 | QScriptContext* result = _context->parentContext(); | 54 | QScriptContext* result = _context->parentContext(); |
| 55 | return ScriptContextPointer(new ScriptContextQtWrapper(_engine, result)); | 55 | return result ? ScriptContextPointer(new ScriptContextQtWrapper(_engine, result)) : ScriptContextPointer(); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | ScriptValuePointer ScriptContextQtWrapper::thisObject() const { | 58 | ScriptValuePointer ScriptContextQtWrapper::thisObject() const { |