From 1c86896f53e131f7b72c9e194e92c6fd50a20e73 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Mon, 20 Jun 2011 12:10:26 +0200 Subject: [PATCH] Don't crash if Clipboard and Selection hold the same mimedate Cliboard and Selection can hold the same QMimeData object. Don't delete the mimedata in this case before when clearing only one of them. Reviewed-by: Samuel --- src/plugins/platforms/xcb/qxcbclipboard.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/xcb/qxcbclipboard.cpp b/src/plugins/platforms/xcb/qxcbclipboard.cpp index 31f82443de..550b8cbd73 100644 --- a/src/plugins/platforms/xcb/qxcbclipboard.cpp +++ b/src/plugins/platforms/xcb/qxcbclipboard.cpp @@ -272,7 +272,8 @@ void QXcbClipboard::setMimeData(QMimeData *data, QClipboard::Mode mode) xcb_window_t newOwner = XCB_NONE; - delete m_clientClipboard[mode]; + if (m_clientClipboard[QClipboard::Clipboard] != m_clientClipboard[QClipboard::Selection]) + delete m_clientClipboard[mode]; m_clientClipboard[mode] = 0; m_timestamp[mode] = XCB_CURRENT_TIME;