- 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

1 files changed, 7 insertions, 3 deletions

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
@@ -315,14 +315,16 @@ void MainWindow::slotRunScript() {
 void MainWindow::slotConnect() {
     if ( currentSession() ) {
         bool ret = currentSession()->layer()->open();
         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 );
+        }
     }
 }
 
 void MainWindow::slotDisconnect() {
     if ( currentSession() ) {
         currentSession()->layer()->close();
@@ -361,13 +363,15 @@ void MainWindow::slotConfigure() {
 void MainWindow::slotClose() {
     if (!currentSession() )
         return;
 
     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!!");
 
     if (!currentSession() ) {
         m_connect->setEnabled( false );