diff --git a/doc/ChangeLog b/doc/ChangeLog index 0b05d9278..5b86aeed8 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,5 +1,10 @@ 2011-01-22 vadim + * ObjectManipulator.cpp (contextMenuRequested): fixed #1926 + "Crash when moving object in Standard library". Context menu + item "Move" should be disabled when the object is located in + the read-only library. + * GroupObjectDialog.cpp (setupPopupMenu): see #1976 "Crash when deleting firewall object from rule after export / import library" Crash occurred as the result of the following sequence of actions diff --git a/src/libgui/ObjectManipulator.cpp b/src/libgui/ObjectManipulator.cpp index 99c669431..cd3f186ba 100644 --- a/src/libgui/ObjectManipulator.cpp +++ b/src/libgui/ObjectManipulator.cpp @@ -746,10 +746,13 @@ void ObjectManipulator::contextMenuRequested(const QPoint &pos) // movetargets->setEnabled(moveMenuItem); copyID->setEnabled(copyMenuItem); pasteID->setEnabled(pasteMenuItem); - + cutID->setEnabled(delMenuItem); delID->setEnabled(delMenuItem); + // can not move object if can not delete it + movetargets->setEnabled(delMenuItem); + QList::iterator iter; for (iter=AddObjectActions.begin(); iter!=AddObjectActions.end(); iter++) (*iter)->setEnabled(newMenuItem);