- 3 small fixes, please review:

- disable all relevant menu items when last session has been closed
  (but this might not be the correct bugfix, so consider it temporary)
- don't set menu status to connected when connection fails
- modem sessions: when user cancels connection, close serial connection first
  again, so we can reconnect (re-dial) later without problems

3 files changed, 11 insertions, 2 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
@@ -33,3 +33,7 @@ bool IOModem::open() {
         }
-        else return false;
+        else
+        {
+                close();
+                return false;
+        }
 }
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
@@ -48,2 +48,3 @@ bool IOSerial::open() {
             emit error(CouldNotOpen, strerror(errno));
+            m_fd = 0;
             return FALSE;
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
@@ -320,2 +320,3 @@ void MainWindow::slotConnect() {
                                       QObject::tr("Connecting failed for this session."));
+        else {
         m_connect->setEnabled( false );
@@ -324,2 +325,3 @@ void MainWindow::slotConnect() {
 }
+}
 
@@ -366,3 +368,5 @@ void MainWindow::slotClose() {
     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 */