projects
/
presencevnc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dismissing pw dialog now closes program
[presencevnc]
/
src
/
vncclientthread.cpp
diff --git
a/src/vncclientthread.cpp
b/src/vncclientthread.cpp
index
a9dab21
..
2d1fc9f
100644
(file)
--- a/
src/vncclientthread.cpp
+++ b/
src/vncclientthread.cpp
@@
-173,9
+173,10
@@
VncClientThread::~VncClientThread()
const bool quitSuccess = wait(500);
const bool quitSuccess = wait(500);
- kDebug(5011) << "Quit VNC thread success:" << quitSuccess;
+ kDebug(5011) << "~VncClientThread(): Quit VNC thread success:" << quitSuccess;
delete [] frameBuffer;
delete [] frameBuffer;
+ //cl is free()d when event loop exits.
}
void VncClientThread::checkOutputErrorMessage()
}
void VncClientThread::checkOutputErrorMessage()
@@
-240,7
+241,7
@@
void VncClientThread::emitGotCut(const QString &text)
void VncClientThread::stop()
{
void VncClientThread::stop()
{
- QMutexLocker locker(&mutex);
+//TODO: not locking the mutex leads to a crash, but at least it stops.
m_stopped = true;
}
m_stopped = true;
}
@@
-249,6
+250,7
@@
void VncClientThread::run()
QMutexLocker locker(&mutex);
while (!m_stopped) { // try to connect as long as the server allows
QMutexLocker locker(&mutex);
while (!m_stopped) { // try to connect as long as the server allows
+ kDebug(5011) << "enter loop";
m_passwordError = false;
rfbClientLog = outputHandler;
m_passwordError = false;
rfbClientLog = outputHandler;
@@
-285,6
+287,7
@@
void VncClientThread::run()
// Main VNC event loop
while (!m_stopped) {
// Main VNC event loop
while (!m_stopped) {
+ kDebug(5011) << "entering main event loop";
const int i = WaitForMessage(cl, 500);
if (i < 0)
break;
const int i = WaitForMessage(cl, 500);
if (i < 0)
break;