1 files changed, 5 insertions, 9 deletions

diff --git a/pacman-c++/client/client.cpp b/pacman-c++/client/client.cpp
index a00249b..d20e6bf 100644
--- a/pacman-c++/client/client.cpp
+++ b/pacman-c++/client/client.cpp
@@ -9,16 +9,14 @@ extern "C" {
 }
 
 Client::Client()
-  : m_ambientMuted(false)
+  : m_dialog(NULL), m_ambientMuted(false)
 {
   m_settings = new QSettings(qApp->organizationName(), qApp->applicationName(), this);
-  m_dialog = new QDialog(this);
   m_mainWidget = new MainWidget(this);
   createMenu();
   m_mainWidget->setAmbientMuted(m_ambientMuted);
   setCentralWidget(m_mainWidget);
   showConnectDialog();
-  m_dialog->setFocus();
 }
 
 void Client::createMenu()
@@ -81,6 +79,7 @@ void Client::createMenu()
   disconnectAction->setDisabled(true);
   fileMenu->addAction(disconnectAction);
   connect(disconnectAction, SIGNAL(triggered()), m_mainWidget, SLOT(doDisconnect()));
+  connect(disconnectAction, SIGNAL(triggered()), m_mainWidget, SLOT(deleteGUI()));
   connect(m_mainWidget, SIGNAL(connected(bool)), disconnectAction, SLOT(setEnabled(bool)));
 
   /* exit entry */
@@ -134,10 +133,8 @@ QPixmap Client::soundIcon(bool enabled) const
 void Client::showAbout()
 {
   if (m_dialog != NULL)
-  {
     delete m_dialog;
-    m_dialog = new QDialog(this);
-  }
+  m_dialog = new QDialog(this);
   m_dialog->setWindowTitle("About Pacman");
   m_dialog->setWindowFlags(m_dialog->windowFlags() & ~Qt::WindowContextHelpButtonHint);
 
@@ -176,10 +173,9 @@ void Client::showAbout()
 void Client::showConnectDialog()
 {
   if (m_dialog != NULL)
-  {
     delete m_dialog;
-    m_dialog = new QDialog(this);
-  }
+  m_dialog = new QDialog(this);
+  m_dialog->setModal(true);
   m_dialog->setWindowTitle("Connect");
 
   QGridLayout *layout = new QGridLayout(m_dialog);