Merge lp:~abreu-alexandre/unity-js-scopes/not-handled-activation-query-default into lp:unity-js-scopes

Proposed by Alexandre Abreu
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 137
Merged at revision: 138
Proposed branch: lp:~abreu-alexandre/unity-js-scopes/not-handled-activation-query-default
Merge into: lp:unity-js-scopes
Diff against target: 12 lines (+1/-1)
1 file modified
src/bindings/src/ (+1/-1)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-js-scopes/not-handled-activation-query-default
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email:

Commit message

Return default ActivationQueryBase (not handled) if no callback is found

Description of the change

Return default ActivationQueryBase (not handled) if no callback is found

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/bindings/src/'
--- src/bindings/src/ 2016-02-13 16:01:06 +0000
+++ src/bindings/src/ 2016-03-03 22:01:45 +0000
@@ -145,7 +145,7 @@
145 unity::scopes::Result const &result,145 unity::scopes::Result const &result,
146 unity::scopes::ActionMetadata const &metadata) {146 unity::scopes::ActionMetadata const &metadata) {
147 if (activate_callback_.IsEmpty()) {147 if (activate_callback_.IsEmpty()) {
148 return nullptr;148 return unity::scopes::ScopeBase::activate(result, metadata);
149 }149 }
151 return EventQueue::instance().run<unity::scopes::ActivationQueryBase::UPtr>(151 return EventQueue::instance().run<unity::scopes::ActivationQueryBase::UPtr>(


People subscribed via source and target branches

to all changes: