~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/server/input/android/android_input_registrar.cpp

  • Committer: Daniel van Vugt
  • Date: 2015-02-22 07:46:25 UTC
  • mfrom: (2332 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150222074625-8t23m2sif3dc0j3t
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
101
101
{
102
102
    std::unique_lock<std::mutex> lock(handles_mutex);
103
103
    if (window_handles.find(channel) == window_handles.end())
104
 
        BOOST_THROW_EXCEPTION(std::logic_error("Requesting handle for an unregistered channel"));
 
104
        return droidinput::sp<droidinput::InputWindowHandle>{};
105
105
    return window_handles[channel];
106
106
}
107
107