on xenial help sign in
Fix Unity.Application mock bug: SurfaceManager.surfaceDestroyed(null)
9d4c156Daniel d'Andrada
tests/mocks/Unity/Application/ApplicationInfo.cpp+3−2
@@ -91,11 +91,12 @@ void ApplicationInfo::createSurface()
91void ApplicationInfo::destroySurface()
91void ApplicationInfo::destroySurface()
92{
92{
93 if (!m_surface) return;
93 if (!m_surface) return;
94+
95+ SurfaceManager::singleton()->unregisterSurface(m_surface);
96+
94 MirSurfaceItem* oldSurface = m_surface;
97 MirSurfaceItem* oldSurface = m_surface;
95 m_surface = nullptr;
98 m_surface = nullptr;
96−
97 Q_EMIT surfaceChanged(nullptr);
99 Q_EMIT surfaceChanged(nullptr);
98− SurfaceManager::singleton()->unregisterSurface(m_surface);
99 oldSurface->deleteLater();
100 oldSurface->deleteLater();
100}
101}
101
102