From 494727e1e5f0e459153e8845168545ad4a72e598 Mon Sep 17 00:00:00 2001
From: Björn Hagemeister
Date: Mon, 26 May 2014 18:34:36 +0200
Subject: Several changes: Fixed segmentaion fault, which occured after
 streaming to all clients. Added sessionName as command line argument to
 client, so that it connects immediatly after running to given sessionName. If
 pvsclient shows connected status also display IP-Adress of the running
 pvsmanager.

---
 src/client/toolbar/toolbar.cpp | 6 +++++-
 src/client/toolbar/toolbar.h   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/client/toolbar')

diff --git a/src/client/toolbar/toolbar.cpp b/src/client/toolbar/toolbar.cpp
index bfe4e24..88d4b2a 100644
--- a/src/client/toolbar/toolbar.cpp
+++ b/src/client/toolbar/toolbar.cpp
@@ -22,7 +22,7 @@
  * another widget, this widget becomes a child window inside parent. The new
  * widget is deleted when its parent is deleted.
  */
-Toolbar::Toolbar(QWidget *parent) :
+Toolbar::Toolbar(const QByteArray sessionName, QWidget *parent) :
 	QWidget(parent), _ui(new Ui::Toolbar), _hideTimer(this), _connection(NULL),
 	_blinkTimer(this),_cam32(":cam32.svg"),	_beWatchedEye(":eye")
 {
@@ -40,6 +40,10 @@ Toolbar::Toolbar(QWidget *parent) :
 
 	/* Create the connect window */
 	_connectWindow = new ConnectWindow(NULL);
+	if (!sessionName.isEmpty())
+	{
+		_connectWindow->connectToSession(sessionName);
+	}
 	// Connect the signals
 	connect(_connectWindow, SIGNAL(disconnect()), this, SLOT(onDoDisconnect()));
 	connect(_connectWindow, SIGNAL(connected(ServerConnection*)), this, SLOT(onConnected(ServerConnection*)));
diff --git a/src/client/toolbar/toolbar.h b/src/client/toolbar/toolbar.h
index f01e4ef..c85c501 100644
--- a/src/client/toolbar/toolbar.h
+++ b/src/client/toolbar/toolbar.h
@@ -30,7 +30,7 @@ class Toolbar : public QWidget
 	Q_OBJECT
 
 public:
-	explicit Toolbar(QWidget *parent = 0);
+	explicit Toolbar(const QByteArray sessionName, QWidget *parent = 0);
 	virtual ~Toolbar();
 
 private:
-- 
cgit v1.2.3-55-g7522