Mir

Merge lp:~kdub/mir/server-startup-bandaid into lp:~mir-team/mir/trunk

  1. server-startup-bandaid
  2. Merge into trunk
Proposed by Kevin DuBois
Status: Merged
Approved by: Brandon Schaefer
Approved revision: no longer in the source branch.
Merged at revision: 595
Proposed branch: lp:~kdub/mir/server-startup-bandaid
Merge into: lp:~mir-team/mir/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/server/default_server_configuration.cpp (+1/-1)
To merge this branch: bzr merge lp:~kdub/mir/server-startup-bandaid
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Brandon Schaefer (community) Approve
Review via email: mp+159270@code.launchpad.net

Commit message

lp:mir's default of --enable-input=false is causing clients not to connect somehow. emergency bandaid to get the server working again

Description of the change

lp:mir's default of --enable-input=false is causing clients not to connect somehow. emergency bandaid to get the server working again

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Fixes the problem for me. +1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/default_server_configuration.cpp'
2--- src/server/default_server_configuration.cpp 2013-04-16 09:08:29 +0000
3+++ src/server/default_server_configuration.cpp 2013-04-17 01:11:28 +0000
4@@ -335,7 +335,7 @@
5 return input_manager(
6 [&, this]() -> std::shared_ptr<mi::InputManager>
7 {
8- if (the_options()->get("enable-input", false))
9+ if (the_options()->get("enable-input", true))
10 return std::make_shared<mia::InputManager>(the_input_configuration());
11 else
12 return std::make_shared<mi::NullInputManager>();

Subscribers

People subscribed via source and target branches