Merge branch 'master' of git.openslx.org:pvs2

Conflicts:
	src/client/connectwindow/connectwindow.h

2 files changed, 3 insertions, 4 deletions

diff --git a/src/server/mainwindow/mainwindow.cpp b/src/server/mainwindow/mainwindow.cpp
index 3d0d167..1844458 100644
--- a/src/server/mainwindow/mainwindow.cpp
+++ b/src/server/mainwindow/mainwindow.cpp
@@ -683,7 +683,7 @@ void MainWindow::onButtonTutorToStudent()
 			continue;
 		if ((**it).selected())
 			to = c;
-		else if ((**it).isTutor())
+		if ((**it).isTutor())
 			from = c;
 	}
 	if (to == NULL)
diff --git a/src/server/mainwindow/mainwindow.h b/src/server/mainwindow/mainwindow.h
index 153eb5b..c06f8e9 100644
--- a/src/server/mainwindow/mainwindow.h
+++ b/src/server/mainwindow/mainwindow.h
@@ -11,8 +11,7 @@ class ConnectionFrame;
 class ListenServer;
 class DiscoveryListener;
 
-namespace Ui
-{
+namespace Ui{
 	class MainWindow;
 }
 
@@ -43,7 +42,7 @@ private:
 	// Button block stuff
 	QTimer * _buttonLockTimer;
 	QList<QAction*> _lockingButtons;
-	static const qint64 _buttonBlockTime = 1000;
+	static const qint64 _buttonBlockTime = 600;
 
     /**
      * Downloader for IP - List of possible tutors.