Merge remote-tracking branch 'origin/KDE/4.9'

[dolphin.git] / src / kitemviews / private / kitemlistroleeditor.cpp

diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp
index ead5b298edda1f4820c7335a48c4f09a78ff0d4f..78dbfe95be72958d5a62305f642d16ec9a2cddd9 100644 (file)
--- a/src/kitemviews/private/kitemlistroleeditor.cpp
+++ b/src/kitemviews/private/kitemlistroleeditor.cpp
@@ -144,7 +144,8 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event)
         return;
     case Qt::Key_Enter:
     case Qt::Key_Return:
-        emitRoleEditingFinished();
+        // TODO: find a better way to fix the bug 309760
+        clearFocus(); // emitRoleEditingFinished(); results in a crash
         event->accept();
         return;
     default: