Merge lp:~alan-griffiths/miral/fix-1645284 into lp:miral

Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: 458
Merged at revision: 457
Proposed branch: lp:~alan-griffiths/miral/fix-1645284
Merge into: lp:miral
Diff against target: 12 lines (+2/-1)
1 file modified
miral/active_outputs.cpp (+2/-1)
To merge this branch: bzr merge lp:~alan-griffiths/miral/fix-1645284
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
Review via email: mp+311943@code.launchpad.net

Commit message

[libmiral] Register ActiveOutputsMonitor with the "display configuration observer registrar" before server init starts

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

Ok.
Mir API disappointing to require this in the preinit

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'miral/active_outputs.cpp'
--- miral/active_outputs.cpp 2016-11-28 09:19:40 +0000
+++ miral/active_outputs.cpp 2016-11-28 14:52:28 +0000
@@ -107,7 +107,8 @@
107#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 26, 0)107#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 26, 0)
108 server.override_the_display_configuration_report([this]{ return self; });108 server.override_the_display_configuration_report([this]{ return self; });
109#else109#else
110 server.the_display_configuration_observer_registrar()->register_interest(self);110 server.add_pre_init_callback([this, &server]
111 { server.the_display_configuration_observer_registrar()->register_interest(self); });
111#endif112#endif
112}113}
113114

Subscribers

People subscribed via source and target branches