← Back to branch summary

~alan-griffiths/qtmir/mir-0.27-compat-artful

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/qmirserver_p.cpp

  • Committer: Gerry Boland
  • Date: 2017-03-14 13:49:38 UTC
  • mto: This revision was merged to the branch mainline in revision 623.
  • Revision ID: gerry.boland@canonical.com-20170314134938-94m2jr5k63j03gq9
Fix error

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/mirserver/qmirserver_p.cpp
57
57
 
58
58
bool MirServerThread::waitForMirStartup()
59
59
{
60
 
    const int timeout = RUNNING_ON_VALGRIND ? 10 : 100; // else timeout triggers before Mir ready
 
60
    const int timeout = RUNNING_ON_VALGRIND ? 100 : 10; // else timeout triggers before Mir ready
61
61
 
62
62
    std::unique_lock<decltype(mutex)> lock(mutex);
63
63
    started_cv.wait_for(lock, std::chrono::seconds{timeout}, [&]{ return mir_running; });