3 files changed, 13 insertions, 4 deletions

diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index 22a3673..41f553b 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -31,7 +31,11 @@ bool IOModem::open() {
 	{
 		return true;
 	}
-	else return false;
+	else
+	{
+		close();
+		return false;
+	}
 }
 
 void IOModem::reload( const Profile &config ) {
diff --git a/noncore/apps/opie-console/io_serial.cpp b/noncore/apps/opie-console/io_serial.cpp
index b89a53b..cc63c58 100644
--- a/noncore/apps/opie-console/io_serial.cpp
+++ b/noncore/apps/opie-console/io_serial.cpp
@@ -46,6 +46,7 @@ bool IOSerial::open() {
         m_fd = ::open(m_device, O_RDWR | O_NOCTTY | O_NONBLOCK);
         if (m_fd < 0) {
             emit error(CouldNotOpen, strerror(errno));
+            m_fd = 0;
             return FALSE;
         }
         tcgetattr(m_fd, &tty);
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 4326609..9ccefa0 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -318,8 +318,10 @@ void MainWindow::slotConnect() {
         if(!ret) QMessageBox::warning(currentSession()->widgetStack(),
                                       QObject::tr("Failed"),
                                       QObject::tr("Connecting failed for this session."));
-        m_connect->setEnabled( false );
-        m_disconnect->setEnabled( true );
+        else {
+            m_connect->setEnabled( false );
+            m_disconnect->setEnabled( true );
+        }
     }
 }
 
@@ -364,7 +366,9 @@ void MainWindow::slotClose() {
 
     Session* ses = currentSession();
     qWarning("removing! currentSession %s", currentSession()->name().latin1() );
-    tabWidget()->remove( currentSession() );
+	/* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */
+	m_curSession = NULL;
+    tabWidget()->remove( /*currentSession()*/ses );
     /*it's autodelete */
     m_sessions.remove( ses );
     qWarning("after remove!!");