← Back to branch summary

~mir-team/mir/fix-1546933-3

« back to all changes in this revision

Viewing changes to src/client/mir_connection.cpp

  • Committer: Daniel van Vugt
  • Date: 2016-03-03 07:24:16 UTC
  • mfrom: (3324.1.34 development-branch)
  • Revision ID: daniel.van.vugt@canonical.com-20160303072416-u3u60nx38bu4wpgq
Merge latest trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/mir_connection.cpp
591
591
        std::lock_guard<decltype(mutex)> lock(mutex);
592
592
        disconnecting = true;
593
593
    }
 
594
    surface_map->with_all_streams_do([](mcl::BufferReceiver* receiver)
 
595
    {
 
596
        receiver->buffer_unavailable();
 
597
    });
 
598
 
594
599
    disconnect_wait_handle.expect_result();
595
600
    server.disconnect(ignored.get(), ignored.get(),
596
601
                      google::protobuf::NewCallback(this, &MirConnection::done_disconnect));
786
791
    {
787
792
        auto stream = std::make_shared<mcl::BufferStream>(
788
793
            this, request->wh, server, platform,
789
 
            *protobuf_bs, make_perf_report(logger), std::string{}, mir::geometry::Size{0,0}, nbuffers);
 
794
            *protobuf_bs, make_perf_report(logger), std::string{},
 
795
            mir::geometry::Size{request->parameters.width(), request->parameters.height()}, nbuffers);
790
796
        surface_map->insert(mf::BufferStreamId(protobuf_bs->id().value()), stream);
791
797
 
792
798
        if (request->callback)