Skip to content
Permalink
Browse files

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

  • Loading branch information
nirvn authored and m-kuhn committed Jun 16, 2016
1 parent 4574f95 commit 4746158a2cf064725f04f84f9932f0c4732493d0
Showing with 4 additions and 2 deletions.
  1. +4 −2 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 );
}

0 comments on commit 4746158

Please sign in to comment.
You can’t perform that action at this time.