1
=== modified file 'src/server/scene/mediating_display_changer.cpp'
2
--- src/server/scene/mediating_display_changer.cpp	2017-07-28 17:00:43 +0000
3
+++ src/server/scene/mediating_display_changer.cpp	2017-08-09 15:03:50 +0000
4
@@ -42,6 +42,7 @@
5
42
42
6
43
namespace
43
namespace
7
44
{
44
{
8
45
char const* const bad_display_config = "Invalid or inconsistent display configuration";
9
45
46
10
46
class DisplayConfigurationInProgressError : public mir::ClientVisibleError
47
class DisplayConfigurationInProgressError : public mir::ClientVisibleError
11
47
{
48
{
12
@@ -184,6 +185,11 @@
13
184
    std::shared_ptr<mf::Session> const& session,
185
    std::shared_ptr<mf::Session> const& session,
14
185
    std::shared_ptr<mg::DisplayConfiguration> const& conf)
186
    std::shared_ptr<mg::DisplayConfiguration> const& conf)
15
186
{
187
{
16
188
    if (!conf->valid())
17
189
    {
18
190
        BOOST_THROW_EXCEPTION(std::runtime_error(bad_display_config));
19
191
    }
20
192
21
187
    {
193
    {
22
188
        std::lock_guard<std::mutex> lg{configuration_mutex};
194
        std::lock_guard<std::mutex> lg{configuration_mutex};
23
189
        config_map[session] = conf;
195
        config_map[session] = conf;
24
@@ -262,6 +268,11 @@
25
262
    std::shared_ptr<graphics::DisplayConfiguration> const& conf,
268
    std::shared_ptr<graphics::DisplayConfiguration> const& conf,
26
263
    std::chrono::seconds timeout)
269
    std::chrono::seconds timeout)
27
264
{
270
{
28
271
    if (!conf->valid())
29
272
    {
30
273
        BOOST_THROW_EXCEPTION(std::runtime_error(bad_display_config));
31
274
    }
32
275
33
265
    {
276
    {
34
266
        std::lock_guard<std::mutex> lock{configuration_mutex};
277
        std::lock_guard<std::mutex> lock{configuration_mutex};
35
267
278
36
@@ -553,6 +564,11 @@
37
553
564
38
554
void ms::MediatingDisplayChanger::set_base_configuration(std::shared_ptr<mg::DisplayConfiguration> const &conf)
565
void ms::MediatingDisplayChanger::set_base_configuration(std::shared_ptr<mg::DisplayConfiguration> const &conf)
39
555
{
566
{
40
567
    if (!conf->valid())
41
568
    {
42
569
        BOOST_THROW_EXCEPTION(std::runtime_error(bad_display_config));
43
570
    }
44
571
45
556
    server_action_queue->enqueue(
572
    server_action_queue->enqueue(
46
557
        this,
573
        this,
47
558
        [this, conf]
574
        [this, conf]
48
559
575
49
=== modified file 'tests/unit-tests/scene/test_mediating_display_changer.cpp'
50
--- tests/unit-tests/scene/test_mediating_display_changer.cpp	2017-07-28 17:00:43 +0000
51
+++ tests/unit-tests/scene/test_mediating_display_changer.cpp	2017-08-09 15:03:50 +0000
52
@@ -454,7 +454,7 @@
53
454
    conf->for_each_output(
454
    conf->for_each_output(
54
455
        [&new_output_enabled](mg::UserDisplayConfigurationOutput& output)
455
        [&new_output_enabled](mg::UserDisplayConfigurationOutput& output)
55
456
        {
456
        {
57
457
            if (!output.used)
457
            if (output.connected && !output.used)
58
458
            {
458
            {
59
459
                new_output_enabled = true;
459
                new_output_enabled = true;
60
460
                output.used = true;
460
                output.used = true;
Reviewer	Review Type	Date Requested	Status
Brandon Schaefer (community)		2017-08-08	Approve on 2017-08-09
Mir CI Bot	continuous-integration		Approve on 2017-08-09
Review via email: mp+328730@code.launchpad.net