2 files changed, 7 insertions, 3 deletions

diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index b495f39..77ced85 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -5,6 +5,8 @@
 #include "io_serial.h"
 
 IOSerial::IOSerial(const Profile &config) : IOLayer(config) {
+    m_read = 0l;
+    m_error = 0l;
     m_fd = 0;
     reload(config);
 }
@@ -112,6 +114,7 @@ bool IOSerial::open() {
         return TRUE;
     } else {
         emit error(Refuse, tr("Device is already connected"));
+        m_fd = 0;
         return FALSE;
     }
 }
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index aeb3742..0bd6a13 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -69,7 +69,7 @@ void MainWindow::initUI() {
     m_terminate = new QAction();
     m_terminate->setText( tr("Terminate") );
     m_terminate->addTo( m_console );
-    connect(m_disconnect, SIGNAL(activated() ),
+    connect(m_terminate, SIGNAL(activated() ),
             this, SLOT(slotTerminate() ) );
 
     a = new QAction();
@@ -188,14 +188,15 @@ void MainWindow::slotConfigure() {
  * and set the currentSession()
  */
 void MainWindow::slotClose() {
+    qWarning("close");
     if (!currentSession() )
         return;
 
     tabWidget()->remove( currentSession() );
-    tabWidget()->setCurrent( m_sessions.first() );
+    /*it's autodelete */
     m_sessions.remove( m_curSession );
-    delete m_curSession;
     m_curSession = m_sessions.first();
+    tabWidget()->setCurrent( m_curSession );
 }
 
 /*