1
=== modified file 'src/modules/Unity/ApplicationManager/application_manager.cpp'
2
--- src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-15 18:10:19 +0000
3
+++ src/modules/Unity/ApplicationManager/application_manager.cpp	2013-08-19 10:10:25 +0000
4
@@ -50,10 +50,11 @@
5
50
{
50
{
6
51
    DLOG("ApplicationManager::ApplicationManager (this=%p)", this);
51
    DLOG("ApplicationManager::ApplicationManager (this=%p)", this);
7
52
52
9
53
    QMirServerApplication* mirServerApplication = static_cast<QMirServerApplication*>(QCoreApplication::instance());
53
    QMirServerApplication* mirServerApplication = dynamic_cast<QMirServerApplication*>(QCoreApplication::instance());
10
54
    if (mirServerApplication == NULL) {
54
    if (mirServerApplication == NULL) {
11
55
        LOG("Need to use QMirServerApplication");
55
        LOG("Need to use QMirServerApplication");
12
56
        QCoreApplication::quit();
56
        QCoreApplication::quit();
13
57
        return;
14
57
    }
58
    }
15
58
    m_mirServer = mirServerApplication->server();
59
    m_mirServer = mirServerApplication->server();
16
59
60
17
60
61
18
=== modified file 'src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp'
19
--- src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp	2013-08-09 13:16:13 +0000
20
+++ src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp	2013-08-19 10:10:25 +0000
21
@@ -47,10 +47,11 @@
22
47
{
47
{
23
48
    DLOG("MirSurfaceManager::MirSurfaceManager (this=%p)", this);
48
    DLOG("MirSurfaceManager::MirSurfaceManager (this=%p)", this);
24
49
49
26
50
    QMirServerApplication* mirServerApplication = static_cast<QMirServerApplication*>(QCoreApplication::instance());
50
    QMirServerApplication* mirServerApplication = dynamic_cast<QMirServerApplication*>(QCoreApplication::instance());
27
51
    if (mirServerApplication == NULL) {
51
    if (mirServerApplication == NULL) {
28
52
        LOG("Need to use QMirServerApplication");
52
        LOG("Need to use QMirServerApplication");
29
53
        QCoreApplication::quit();
53
        QCoreApplication::quit();
30
54
        return;
31
54
    }
55
    }
32
55
    m_mirServer = mirServerApplication->server();
56
    m_mirServer = mirServerApplication->server();
33
56
57
Status:	Merged
Approved by:	Albert Astals Cid on 2013-08-19
Approved revision:	41
Merged at revision:	41
Proposed branch:	lp:~aacid/unity-mir/fix_qmir_server_app_check
Merge into:	lp:unity-mir
Diff against target:	32 lines (+4/-2) 2 files modified src/modules/Unity/ApplicationManager/application_manager.cpp (+2/-1) src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp (+2/-1)
To merge this branch:	bzr merge lp:~aacid/unity-mir/fix_qmir_server_app_check
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-08-19
Gerry Boland (community)		2013-08-19	Approve on 2013-08-19
Review via email: mp+180822@code.launchpad.net