Merge with branch1.2

1 files changed, 8 insertions, 5 deletions

diff --git a/src/pluginlistsortproxy.cpp b/src/pluginlistsortproxy.cpp
index 8d63e2e2..b8ac220a 100644
--- a/src/pluginlistsortproxy.cpp
+++ b/src/pluginlistsortproxy.cpp
@@ -52,11 +52,14 @@ void PluginListSortProxy::setEnabledColumns(unsigned int columns)
 

 Qt::ItemFlags PluginListSortProxy::flags(const QModelIndex &modelIndex) const

 {

-  Qt::ItemFlags flags = sourceModel()->flags(mapToSource(modelIndex));

-/*  if (sortColumn() == PluginList::COL_NAME) {

-    flags &= ~Qt::ItemIsDragEnabled;

-  }*/

-  return flags;

+/*  Qt::ItemFlags flags;

+  QModelIndex index = mapToSource(modelIndex);

+  if (index.isValid()) {

+    flags = sourceModel()->flags(index);

+  }

+  return flags;*/

+

+  return sourceModel()->flags(mapToSource(modelIndex));

 }