diff options
| author | Frank Reininghaus <[email protected]> | 2014-06-12 08:37:11 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-06-12 08:37:11 +0200 |
| commit | 9dc1513f8bae968a363ea74af90a4042382d3d20 (patch) | |
| tree | cc7d8b4b1f82a506d2c47cd4fbf21af60a428346 /src/dolphincontextmenu.cpp | |
| parent | 3b119c4ff95876534783c53be3e72af0b6744100 (diff) | |
Do not crash if QApplication::clipboard()->mimeData() is a null pointer
This removes the remaining unchecked accesses to the clipboard mime
data after commit 7828b057da0491f1b08bfaec681067e195d7b6ca. According
to a bug report, it can be a null pointer on Wayland.
BUG: 335053
REVIEW: 118649
Diffstat (limited to 'src/dolphincontextmenu.cpp')
| -rw-r--r-- | src/dolphincontextmenu.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index f295de708..e692c8fa9 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -429,10 +429,9 @@ QAction* DolphinContextMenu::createPasteAction() QAction* action = 0; const bool isDir = !m_fileInfo.isNull() && m_fileInfo.isDir(); if (isDir && (m_selectedItems.count() == 1)) { + const QPair<bool, QString> pasteInfo = KonqOperations::pasteInfo(m_fileInfo.url()); action = new QAction(KIcon("edit-paste"), i18nc("@action:inmenu", "Paste Into Folder"), this); - const QMimeData* mimeData = QApplication::clipboard()->mimeData(); - const KUrl::List pasteData = KUrl::List::fromMimeData(mimeData); - action->setEnabled(!pasteData.isEmpty() && selectedItemsProperties().supportsWriting()); + action->setEnabled(pasteInfo.first); connect(action, SIGNAL(triggered()), m_mainWindow, SLOT(pasteIntoFolder())); } else { action = m_mainWindow->actionCollection()->action(KStandardAction::name(KStandardAction::Paste)); |
