Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Esteban Blanc
proview
Commits
8541d2e2
Commit
8541d2e2
authored
Mar 06, 2018
by
Claes Sjofors
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wb vrepmem bugfix, no name check on move object
parent
027963ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
wb/lib/wb/src/wb_vrepmem.cpp
wb/lib/wb/src/wb_vrepmem.cpp
+9
-3
No files found.
wb/lib/wb/src/wb_vrepmem.cpp
View file @
8541d2e2
...
...
@@ -848,7 +848,7 @@ wb_orep *wb_vrepmem::createObject(pwr_tStatus *sts, wb_cdef cdef, wb_destination
*
sts
=
LDH__BADDEST
;
return
0
;
}
// Check that name is uni
c
// Check that name is uni
que
if
(
name
&&
!
nameCheck
(
dest
,
name
.
segment
(),
code
))
{
*
sts
=
LDH__NAMALREXI
;
return
0
;
...
...
@@ -1183,6 +1183,12 @@ bool wb_vrepmem::moveObject(pwr_tStatus *sts, wb_orep *orep, wb_destination &d)
mem_object
*
memo
=
((
wb_orepmem
*
)
orep
)
->
memobject
();
// Check that name is unique
if
(
!
nameCheck
(
dest
,
memo
->
name
(),
code
))
{
*
sts
=
LDH__NAMALREXI
;
return
false
;
}
if
(
m_classeditor
&&
!
classeditorCheckMove
(
memo
,
code
,
dest
,
sts
))
return
false
;
...
...
@@ -1878,7 +1884,7 @@ bool wb_vrepmem::exportPaste(wb_treeimport &i, pwr_tOid destination, ldh_eDest d
}
//
// Check that the name of an object is uni
c
within a sibling group
// Check that the name of an object is uni
que
within a sibling group
//
bool
wb_vrepmem
::
nameCheck
(
mem_object
*
memo
)
{
...
...
@@ -2952,4 +2958,4 @@ void wb_vrepmem::printPaletteFile()
}
PalFile
::
config_tree_print
(
pal_cLocalPaletteFile
,
menu
,
&
psts
);
}
\ No newline at end of file
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment