Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
NuttX RTOS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
f4grx
NuttX RTOS
Commits
10e71059
Commit
10e71059
authored
7 years ago
by
Gregory Nutt
Browse files
Options
Downloads
Patches
Plain Diff
graphics/vnc/server: Fix an error in the VNC server introduced with recent big set of changes.
parent
9e25d892
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
graphics/vnc/server/vnc_fbdev.c
+6
-6
6 additions, 6 deletions
graphics/vnc/server/vnc_fbdev.c
with
6 additions
and
6 deletions
graphics/vnc/server/vnc_fbdev.c
+
6
−
6
View file @
10e71059
...
...
@@ -538,7 +538,7 @@ static inline int vnc_wait_start(int display)
static
inline
int
vnc_wait_connect
(
int
display
)
{
int
errcode
;
int
re
sul
t
;
int
ret
;
/* Check if there has been a session allocated yet. This is one of the
* first things that the VNC server will do with the kernel thread is
...
...
@@ -581,14 +581,14 @@ static inline int vnc_wait_connect(int display)
* counting semaphore screw-up?
*/
re
sul
t
=
g_fbstartup
[
display
].
result
;
if
(
re
sul
t
!=
-
EBUSY
)
ret
=
g_fbstartup
[
display
].
result
;
if
(
ret
!=
-
EBUSY
)
{
#ifdef CONFIG_DEBUG_FEATURES
if
(
re
sul
t
<
0
)
if
(
ret
<
0
)
{
DEBUGASSERT
(
g_vnc_sessions
[
display
]
==
NULL
);
gerr
(
"ERROR: VNC server startup failed: %d
\n
"
,
re
sul
t
);
gerr
(
"ERROR: VNC server startup failed: %d
\n
"
,
ret
);
}
else
{
...
...
@@ -596,7 +596,7 @@ static inline int vnc_wait_connect(int display)
g_vnc_sessions
[
display
]
->
state
==
VNCSERVER_RUNNING
);
}
#endif
return
re
sul
t
;
return
ret
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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