← Back to branch summary

~mir-team/mir/in-process-egl+input-conglomeration

« back to all changes in this revision

Viewing changes to src/server/display_server.cpp

Merged trunk and fixed issues

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/display_server.cpp
79
79
    {
80
80
        try
81
81
        {
 
82
            TryButRevertIfUnwinding input{
 
83
                [this] { input_manager->stop(); },
 
84
                [this] { input_manager->start(); }};
 
85
 
82
86
            TryButRevertIfUnwinding comp{
83
87
                [this] { compositor->stop(); },
84
88
                [this] { compositor->start(); }};
109
113
                [this] { communicator->start(); },
110
114
                [this] { communicator->stop(); }};
111
115
 
 
116
            TryButRevertIfUnwinding input{
 
117
                [this] { input_manager->start(); },
 
118
                [this] { input_manager->stop(); }};
 
119
 
112
120
            compositor->start();
113
121
        }
114
122
        catch(std::runtime_error const&)