From b20bdd9202dd07871f765a320343377f86e4d5ca Mon Sep 17 00:00:00 2001
From: sr
Date: Wed, 6 Feb 2013 20:33:54 +0100
Subject: [CLIENT] Request full screen update from VNC server after the frame
 buffer has been set up

---
 src/client/vnc/vncwindow.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/client/vnc/vncwindow.cpp')

diff --git a/src/client/vnc/vncwindow.cpp b/src/client/vnc/vncwindow.cpp
index 6cbb23e..f55aa28 100644
--- a/src/client/vnc/vncwindow.cpp
+++ b/src/client/vnc/vncwindow.cpp
@@ -26,7 +26,7 @@ VncWindow::VncWindow(QWidget *parent) :
 
 VncWindow::~VncWindow()
 {
-	close();
+	//
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -100,6 +100,11 @@ void VncWindow::onThreadFinished()
 		_vncWorker = NULL;
 		this->close();
 	}
+	if(_redrawTimer != 0)
+	{
+		killTimer(_redrawTimer);
+		_redrawTimer = 0;
+	}
 }
 
 /**
@@ -108,7 +113,7 @@ void VncWindow::onThreadFinished()
 void VncWindow::onProjectionStarted()
 {
 	emit running(true, _clientId);
-	_redrawTimer = startTimer(2000);
+	//_redrawTimer = startTimer(5000);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -116,13 +121,13 @@ void VncWindow::onProjectionStarted()
 
 void VncWindow::timerEvent(QTimerEvent *event)
 {
-	killTimer(event->timerId());
 	if (event->timerId() == _redrawTimer)
 	{
-		_redrawTimer = 0;
 		if (this->isVisible())
 			this->repaint();
 	}
+	else
+		killTimer(event->timerId());
 }
 
 void VncWindow::paintEvent(QPaintEvent *event)
@@ -135,7 +140,6 @@ void VncWindow::paintEvent(QPaintEvent *event)
 void VncWindow::resizeEvent(QResizeEvent* event)
 {
 	_vncWorker->setTargetSize(event->size());
-	_redrawTimer = startTimer(1000);
 }
 
 void VncWindow::draw(const int x, const int y, const int w, const int h)
@@ -256,7 +260,10 @@ void VncWindow::keyEventHandler(QKeyEvent *e)
 void VncWindow::keyPressEvent(QKeyEvent* event)
 {
 	if (event->key() == Qt::Key_Escape)
+	{
+		_clientId = 0;
 		this->close();
+	}
 }
 
 //removes modifier keys which have been pressed
-- 
cgit v1.2.3-55-g7522