git.netxms.org
/
public
/
netxms.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9688e44
)
changed template object modification after DC object delete
author
Victor Kirhenshtein
<victor@netxms.org>
Wed, 3 Aug 2016 14:28:18 +0000
(17:28 +0300)
committer
Victor Kirhenshtein
<victor@netxms.org>
Wed, 3 Aug 2016 14:28:18 +0000
(17:28 +0300)
src/server/core/template.cpp
patch
|
blob
|
blame
|
history
diff --git
a/src/server/core/template.cpp
b/src/server/core/template.cpp
index
016e4be
..
ec461d3
100644
(file)
--- a/
src/server/core/template.cpp
+++ b/
src/server/core/template.cpp
@@
-473,7
+473,6
@@
bool Template::deleteDCObject(UINT32 dcObjectId, bool needLock)
// Destroy item
DbgPrintf(7, _T("Template::DeleteDCObject: deleting DCObject %d from object %d"), (int)dcObjectId, (int)m_id);
destroyItem(object, i);
- m_isModified = true;
success = true;
DbgPrintf(7, _T("Template::DeleteDCObject: DCO deleted from object %d"), (int)m_id);
break;
@@
-482,6
+481,13
@@
bool Template::deleteDCObject(UINT32 dcObjectId, bool needLock)
if (needLock)
unlockDciAccess();
+
+ if (success)
+ {
+ lockProperties();
+ setModified(false);
+ unlockProperties();
+ }
return success;
}