2 files changed, 3 insertions, 6 deletions

diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index 9d27c85..a0f72ae 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -26,24 +26,25 @@ bool IOIrda::open() {
     m_attach = new Opie::Core::OProcess();
     *m_attach << "irattach /dev/ttyS2 -s";
 
     connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
              this, SLOT( slotExited(Opie::Core::OProcess*) ) );
 
     if ( m_attach->start() ) {
         ret= IOSerial::open();
     } else {
     // emit error!!!
         delete m_attach;
 	m_attach = 0l;
+	ret = false;
     }
     return ret;
 }
 
 void IOIrda::reload( const Profile &config ) {
     m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE);
     m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD);
     m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY);
     m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS);
     m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS);
     m_flow = config.readNumEntry("Flow", IRDA_DEFAULT_FLOW);
 }
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index aba7244..a884179 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -698,33 +698,29 @@ void MainWindow::slotFullscreen() {
         ( m_curSession->widgetStack() )->show();
 
         ( ( m_curSession->emulationHandler() )->cornerButton() )->show();
 
         connect( ( m_curSession->emulationHandler() )->cornerButton(), SIGNAL( pressed() ), this, SLOT( slotFullscreen() ) );
     }
 
     m_isFullscreen = !m_isFullscreen;
 }
 
 void MainWindow::slotScrollbarSelected(int index)
 {
-	int loc;
+    int loc = 0;
 
     Config cfg( "Konsole" );
     cfg.setGroup("ScrollBar");
-    if(index == sm_none)
-    {
-		loc = 0;
-    }
-    else if(index == sm_left)
+    if(index == sm_left)
     {
 		loc = 1;
     }
     else if(index == sm_right)
     {
 		loc = 2;
     }
 	
 	cfg.writeEntry("Position", loc);
 
     if (currentSession()) {
         currentSession()->emulationHandler()->setScrollbarLocation(loc);