Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
airliquide
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs
gui
airliquide
Commits
54fa1ed0
Commit
54fa1ed0
authored
8 months ago
by
Giacomo Strangolino
Browse files
Options
Downloads
Patches
Plain Diff
shut down ORB before returning from main.cpp
parent
34025101
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
airliquide.pro
+3
-0
3 additions, 0 deletions
airliquide.pro
src/main.cpp
+13
-3
13 additions, 3 deletions
src/main.cpp
with
16 additions
and
3 deletions
airliquide.pro
+
3
−
0
View file @
54fa1ed0
isEmpty
(
CUMBIA_ROOT
)
{
CUMBIA_ROOT
=/
runtime
}
isEmpty
(
CUMBIA_ROOT
)
{
CUMBIA_ROOT
=/
usr
/
local
/
cumbia
-
libs
}
include
(
$$
{
CUMBIA_ROOT
}
/
include
/
quapps
/
quapps
.
pri
)
CONFIG
+=
debug
...
...
This diff is collapsed.
Click to expand it.
src/main.cpp
+
13
−
3
View file @
54fa1ed0
...
...
@@ -8,6 +8,10 @@
#include
<qthreadseventbridgefactory.h>
// cumbia
#ifdef QUMBIA_TANGO_CONTROLS_VERSION
#include
<cutango-world.h>
#endif
#define VERSION "1.0"
int
main
(
int
argc
,
char
*
argv
[])
...
...
@@ -35,9 +39,15 @@ int main(int argc, char *argv[])
p
=
a
->
cu_pool
();
delete
w
;
for
(
const
std
::
string
&
n
:
p
->
names
())
if
(
p
->
get
(
n
))
for
(
const
std
::
string
&
n
:
p
->
names
())
{
if
(
p
->
get
(
n
))
{
printf
(
"main.cpp : \e[1;35mdeleting '%s'\e[0m
\n
"
,
n
.
c_str
());
delete
p
->
get
(
n
);
}
}
#ifdef QUMBIA_TANGO_CONTROLS_VERSION
printf
(
"main.cpp: shutting down the ORB
\n
"
);
CuTangoWorld
().
orb_cleanup
();
#endif
return
ret
;
}
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment