diff options
| author | Frank Reininghaus <[email protected]> | 2014-06-12 08:51:50 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2014-06-12 08:51:50 +0200 |
| commit | 6bccf73e9270e698e7ca23eb2dcaa05318e7b198 (patch) | |
| tree | 2239225d684d44fabfc03a6e20a548da5cd3ec01 /src/kitemviews/private | |
| parent | 05c8254ee47cb668771bb4009209122364e8a2a6 (diff) | |
| parent | 9dc1513f8bae968a363ea74af90a4042382d3d20 (diff) | |
Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
dolphin/src/dolphincontextmenu.cpp
dolphin/src/panels/folders/treeviewcontextmenu.cpp
Diffstat (limited to 'src/kitemviews/private')
| -rw-r--r-- | src/kitemviews/private/kfileitemclipboard.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp index ebf50e215..69df5dee7 100644 --- a/src/kitemviews/private/kfileitemclipboard.cpp +++ b/src/kitemviews/private/kfileitemclipboard.cpp @@ -55,6 +55,14 @@ KFileItemClipboard::~KFileItemClipboard() void KFileItemClipboard::updateCutItems() { const QMimeData* mimeData = QApplication::clipboard()->mimeData(); + + // mimeData can be 0 according to https://bugs.kde.org/show_bug.cgi?id=335053 + if (!mimeData) { + m_cutItems.clear(); + emit cutItemsChanged(); + return; + } + const QByteArray data = mimeData->data("application/x-kde-cutselection"); const bool isCutSelection = (!data.isEmpty() && data.at(0) == QLatin1Char('1')); if (isCutSelection) { |