Skip to content

Commit 7716974

Browse files
author
morb_au
committedAug 16, 2006
Fix for trac ticket #236 (Cannot stop editing mode when nothing was edited), which was carelessly introduced in the second dot point of r5694.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5702 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed
 

‎src/gui/qgsvectorlayer.cpp

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,27 +1996,31 @@ void QgsVectorLayer::stopEditing()
19961996
emit editingStopped(false);
19971997
}
19981998

1999-
if (
2000-
(commitSuccessful) ||
2001-
(rollbackSuccessful)
2002-
)
2003-
{
2004-
// convert state to non-editing mode
2005-
deleteCachedGeometries();
1999+
}
20062000

2007-
mEditable=false;
2008-
triggerRepaint();
2009-
mModified=false;
2010-
if(isValid())
2001+
if (
2002+
(!dataProvider) ||
2003+
(!mModified) ||
2004+
(commitSuccessful) ||
2005+
(rollbackSuccessful)
2006+
)
2007+
{
2008+
// convert state to non-editing mode
2009+
deleteCachedGeometries();
2010+
2011+
mEditable=false;
2012+
triggerRepaint();
2013+
mModified=false;
2014+
if(isValid())
2015+
{
2016+
updateItemPixmap();
2017+
if(mToggleEditingAction)
20112018
{
2012-
updateItemPixmap();
2013-
if(mToggleEditingAction)
2014-
{
2015-
mToggleEditingAction->setChecked(false);
2016-
}
2019+
mToggleEditingAction->setChecked(false);
20172020
}
20182021
}
20192022
}
2023+
20202024
}
20212025

20222026
// return state of scale dependent rendering. True if features should

0 commit comments

Comments
 (0)
Please sign in to comment.