fix bookmarks editing regression (fixes #15034) (#3204)

qgis · Jun 16, 2016 · 4746158 · 4746158
1 parent 4574f95
commit 4746158
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp
@@ -21,6 +21,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsmaprenderer.h"
 #include "qgsproject.h"
+#include "qgsmessagelog.h"
 
 #include "qgslogger.h"
 
@@ -562,7 +563,7 @@ QVariant QgsMergedBookmarksTableModel::data( const QModelIndex& index, int role
 
 bool QgsMergedBookmarksTableModel::setData( const QModelIndex& index, const QVariant& value, int role )
 {
-  // is project or QGIS
+  // last column triggers a move from QGIS to project bookmark
   if ( index.column() == mQgisTableModel.columnCount() )
   {
     if ( index.row() < mQgisTableModel.rowCount() )
@@ -581,7 +582,8 @@ bool QgsMergedBookmarksTableModel::setData( const QModelIndex& index, const QVar
     }
     return true;
   }
-  if ( index.column() < mQgisTableModel.rowCount() )
+
+  if ( index.row() < mQgisTableModel.rowCount() )
   {
     return mQgisTableModel.setData( index, value, role );
   }