← 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.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.cpp
61
61
    if (d->serverThread->isRunning()) {
62
62
        d->stop();
63
63
 
64
 
        const int timeout = RUNNING_ON_VALGRIND ? 10 : 100; // else timeout triggers before Mir done
 
64
        const int timeout = RUNNING_ON_VALGRIND ? 100 : 10; // else timeout triggers before Mir done
65
65
        if (!d->serverThread->wait(timeout * 1000)) {
66
66
            // do something to indicate fail during shutdown
67
67
            qCritical() << "ERROR: QMirServer - Mir failed to shut down correctly, terminating it";