Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Network
KRDC
Commits
6afdbb5e
Commit
6afdbb5e
authored
Jul 18, 2010
by
Urs Wolfer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix possible crash when quitting while connecting (VNC).
svn path=/trunk/KDE/kdenetwork/krdc/; revision=1151206
parent
7a379d14
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
vnc/vncclientthread.cpp
vnc/vncclientthread.cpp
+5
-2
vnc/vncview.cpp
vnc/vncview.cpp
+2
-2
No files found.
vnc/vncclientthread.cpp
View file @
6afdbb5e
...
...
@@ -192,6 +192,7 @@ VncClientThread::VncClientThread(QObject *parent)
:
QThread
(
parent
)
,
frameBuffer
(
0
)
,
m_stopped
(
false
)
,
cl
(
0
)
{
QMutexLocker
locker
(
&
mutex
);
...
...
@@ -210,8 +211,10 @@ VncClientThread::~VncClientThread()
kDebug
(
5011
)
<<
"Attempting to stop in deconstructor, will crash if this fails:"
<<
quitSuccess
;
}
// Disconnect from vnc server & cleanup allocated resources
rfbClientCleanup
(
cl
);
if
(
cl
)
{
// Disconnect from vnc server & cleanup allocated resources
rfbClientCleanup
(
cl
);
}
delete
[]
frameBuffer
;
}
...
...
vnc/vncview.cpp
View file @
6afdbb5e
...
...
@@ -155,6 +155,8 @@ void VncView::startQuitting()
{
kDebug
(
5011
)
<<
"about to quit"
;
setStatus
(
Disconnecting
);
unpressModifiers
();
// Disconnect all signals so that we don't get any more callbacks from the client thread
...
...
@@ -167,8 +169,6 @@ void VncView::startQuitting()
const
bool
connected
=
status
()
==
RemoteView
::
Connected
;
setStatus
(
Disconnecting
);
m_quitFlag
=
true
;
if
(
connected
)
{
...
...
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