diff --git a/autotests/integration/effects/translucency_test.cpp b/autotests/integration/effects/translucency_test.cpp index 92f15efe93..428026d48c 100644 --- a/autotests/integration/effects/translucency_test.cpp +++ b/autotests/integration/effects/translucency_test.cpp @@ -238,12 +238,9 @@ void TranslucencyTest::testDialogClose() QVERIFY(windowDeletedSpy.isValid()); QVERIFY(windowClosedSpy.wait()); if (windowDeletedSpy.isEmpty()) { - QEXPECT_FAIL("", "BUG 342716", Continue); QVERIFY(windowDeletedSpy.wait()); } - QEXPECT_FAIL("", "BUG 342716", Continue); QCOMPARE(windowDeletedSpy.count(), 1); - QEXPECT_FAIL("", "BUG 342716", Continue); QTRY_VERIFY(!m_translucencyEffect->isActive()); xcb_destroy_window(c.data(), w); c.reset(); diff --git a/effects/translucency/package/contents/code/main.js b/effects/translucency/package/contents/code/main.js index f6468a946e..69c051187d 100644 --- a/effects/translucency/package/contents/code/main.js +++ b/effects/translucency/package/contents/code/main.js @@ -78,6 +78,9 @@ var translucencyEffect = { to: value / 100.0 }] }); + if (window.translucencyWindowTypeAnimation !== undefined) { + cancel(window.translucencyWindowTypeAnimation); + } window.translucencyWindowTypeAnimation = ids; } };