← Back to branch summary

~nick-dedekind/qtmir/miral-DisplayConfigurationStorage

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/dbusfocusinfo.cpp

  • Committer: Nick Dedekind
  • Date: 2017-03-14 12:57:42 UTC
  • mfrom: (569.10.36 qtmir)
  • Revision ID: nick.dedekind@canonical.com-20170314125742-t5iw7pav57abetgn
merged trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/dbusfocusinfo.cpp
112
112
{
113
113
    for (Application* application : m_applications) {
114
114
        auto session = application->session();
115
 
 
116
 
        auto surfaceList = static_cast<MirSurfaceListModel*>(session->surfaceList());
117
 
        for (int i = 0; i < surfaceList->count(); ++i) {
118
 
            auto qmlSurface = static_cast<MirSurfaceInterface*>(surfaceList->get(i));
119
 
            if (qmlSurface->persistentId() == serializedId) {
120
 
                return qmlSurface;
 
115
        if (session) {
 
116
            auto surfaceList = static_cast<MirSurfaceListModel*>(session->surfaceList());
 
117
            for (int i = 0; i < surfaceList->count(); ++i) {
 
118
                auto qmlSurface = static_cast<MirSurfaceInterface*>(surfaceList->get(i));
 
119
                if (qmlSurface->persistentId() == serializedId) {
 
120
                    return qmlSurface;
 
121
                }
121
122
            }
122
 
        }
123
123
 
124
 
        surfaceList = static_cast<MirSurfaceListModel*>(session->promptSurfaceList());
125
 
        for (int i = 0; i < surfaceList->count(); ++i) {
126
 
            auto qmlSurface = static_cast<MirSurfaceInterface*>(surfaceList->get(i));
127
 
            if (qmlSurface->persistentId() == serializedId) {
128
 
                return qmlSurface;
 
124
            surfaceList = static_cast<MirSurfaceListModel*>(session->promptSurfaceList());
 
125
            for (int i = 0; i < surfaceList->count(); ++i) {
 
126
                auto qmlSurface = static_cast<MirSurfaceInterface*>(surfaceList->get(i));
 
127
                if (qmlSurface->persistentId() == serializedId) {
 
128
                    return qmlSurface;
 
129
                }
129
130
            }
130
131
        }
131
132
    }