Commit 6ac99af0 authored by Olivier Blin's avatar Olivier Blin Committed by Olivier Blin
Browse files

Fix connecting to surfaceDestroyed

It was being called with a garbage pointer, since the signal does not
have an object argument anymore.
This has been changed in commit fc439e40


    Rework the way buffers are used and rendered

Change-Id: I220c52285909dc93aebd128fc418df3c8a6bd37c
Reviewed-by: default avatarPier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: default avatarGiulio Camuffo <giulio.camuffo@jollamobile.com>
parent d7ade091
Branches
Tags
No related merge requests found
Showing with 3 additions and 3 deletions
...@@ -112,8 +112,8 @@ private slots: ...@@ -112,8 +112,8 @@ private slots:
emit windowDestroyed(QVariant::fromValue(surface)); emit windowDestroyed(QVariant::fromValue(surface));
} }
void surfaceDestroyed(QObject *object) { void surfaceDestroyed() {
QWaylandQuickSurface *surface = static_cast<QWaylandQuickSurface *>(object); QWaylandQuickSurface *surface = static_cast<QWaylandQuickSurface *>(sender());
if (surface == m_fullscreenSurface) if (surface == m_fullscreenSurface)
m_fullscreenSurface = 0; m_fullscreenSurface = 0;
emit windowDestroyed(QVariant::fromValue(surface)); emit windowDestroyed(QVariant::fromValue(surface));
...@@ -134,7 +134,7 @@ protected: ...@@ -134,7 +134,7 @@ protected:
} }
void surfaceCreated(QWaylandSurface *surface) { void surfaceCreated(QWaylandSurface *surface) {
connect(surface, SIGNAL(destroyed(QObject *)), this, SLOT(surfaceDestroyed(QObject *))); connect(surface, SIGNAL(surfaceDestroyed()), this, SLOT(surfaceDestroyed()));
connect(surface, SIGNAL(mapped()), this, SLOT(surfaceMapped())); connect(surface, SIGNAL(mapped()), this, SLOT(surfaceMapped()));
connect(surface,SIGNAL(unmapped()), this,SLOT(surfaceUnmapped())); connect(surface,SIGNAL(unmapped()), this,SLOT(surfaceUnmapped()));
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment