1
=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
2
--- src/platforms/mirserver/mirserverintegration.cpp	2016-05-05 14:34:21 +0000
3
+++ src/platforms/mirserver/mirserverintegration.cpp	2016-06-07 17:59:16 +0000
4
@@ -140,9 +140,7 @@
5
140
void MirServerIntegration::initialize()
140
void MirServerIntegration::initialize()
6
141
{
141
{
7
142
    // Creates instance of and start the Mir server in a separate thread
142
    // Creates instance of and start the Mir server in a separate thread
11
143
    if (!m_mirServer->start()) {
143
    m_mirServer->start();
9
144
        exit(2);
10
145
    }
12
146
144
13
147
    auto screens = m_mirServer->screensModel().lock();
145
    auto screens = m_mirServer->screensModel().lock();
14
148
    if (!screens) {
146
    if (!screens) {
15
149
147
16
=== modified file 'src/platforms/mirserver/qmirserver.cpp'
17
--- src/platforms/mirserver/qmirserver.cpp	2016-04-29 15:41:00 +0000
18
+++ src/platforms/mirserver/qmirserver.cpp	2016-06-07 17:59:16 +0000
19
@@ -45,23 +45,20 @@
20
45
    stop();
45
    stop();
21
46
}
46
}
22
47
47
24
48
bool QMirServer::start()
48
void QMirServer::start()
25
49
{
49
{
26
50
    Q_D(QMirServer);
50
    Q_D(QMirServer);
27
51
51
28
52
    d->serverThread->start(QThread::TimeCriticalPriority);
52
    d->serverThread->start(QThread::TimeCriticalPriority);
29
53
53
34
54
    if (!d->serverThread->waitForMirStartup())
54
    if (!d->serverThread->waitForMirStartup()) {
35
55
    {
55
        qFatal("ERROR: QMirServer - Mir failed to start"); // will core dump
32
56
        qCritical() << "ERROR: QMirServer - Mir failed to start";
33
57
        return false;
36
58
    }
56
    }
37
59
    d->screensModel->update();
57
    d->screensModel->update();
38
60
    d->screensController = QSharedPointer<ScreensController>(
58
    d->screensController = QSharedPointer<ScreensController>(
39
61
                               new ScreensController(d->screensModel, d->server->the_display(),
59
                               new ScreensController(d->screensModel, d->server->the_display(),
40
62
                                                     d->server->the_display_configuration_controller()));
60
                                                     d->server->the_display_configuration_controller()));
41
63
    Q_EMIT started();
61
    Q_EMIT started();
42
64
    return true;
43
65
}
62
}
44
66
63
45
67
void QMirServer::stop()
64
void QMirServer::stop()
46
68
65
47
=== modified file 'src/platforms/mirserver/qmirserver.h'
48
--- src/platforms/mirserver/qmirserver.h	2016-04-29 15:41:00 +0000
49
+++ src/platforms/mirserver/qmirserver.h	2016-06-07 17:59:16 +0000
50
@@ -34,7 +34,7 @@
51
34
    QMirServer(int &argc, char **argv, QObject* parent=0);
34
    QMirServer(int &argc, char **argv, QObject* parent=0);
52
35
    virtual ~QMirServer();
35
    virtual ~QMirServer();
53
36
36
55
37
    bool start();
37
    void start();
56
38
    Q_SLOT void stop();
38
    Q_SLOT void stop();
57
39
    bool isRunning() const;
39
    bool isRunning() const;
58
40
40
Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot (community)	continuous-integration		Approve on 2016-06-19
Daniel van Vugt		2016-06-07	Approve on 2016-06-07
Review via email: mp+296707@code.launchpad.net