summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-console/io_serial.cpp3
-rw-r--r--noncore/apps/opie-console/mainwindow.cpp7
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 @@
5#include "io_serial.h" 5#include "io_serial.h"
6 6
7IOSerial::IOSerial(const Profile &config) : IOLayer(config) { 7IOSerial::IOSerial(const Profile &config) : IOLayer(config) {
8 m_read = 0l;
9 m_error = 0l;
8 m_fd = 0; 10 m_fd = 0;
9 reload(config); 11 reload(config);
10} 12}
@@ -112,6 +114,7 @@ bool IOSerial::open() {
112 return TRUE; 114 return TRUE;
113 } else { 115 } else {
114 emit error(Refuse, tr("Device is already connected")); 116 emit error(Refuse, tr("Device is already connected"));
117 m_fd = 0;
115 return FALSE; 118 return FALSE;
116 } 119 }
117} 120}
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() {
69 m_terminate = new QAction(); 69 m_terminate = new QAction();
70 m_terminate->setText( tr("Terminate") ); 70 m_terminate->setText( tr("Terminate") );
71 m_terminate->addTo( m_console ); 71 m_terminate->addTo( m_console );
72 connect(m_disconnect, SIGNAL(activated() ), 72 connect(m_terminate, SIGNAL(activated() ),
73 this, SLOT(slotTerminate() ) ); 73 this, SLOT(slotTerminate() ) );
74 74
75 a = new QAction(); 75 a = new QAction();
@@ -188,14 +188,15 @@ void MainWindow::slotConfigure() {
188 * and set the currentSession() 188 * and set the currentSession()
189 */ 189 */
190void MainWindow::slotClose() { 190void MainWindow::slotClose() {
191 qWarning("close");
191 if (!currentSession() ) 192 if (!currentSession() )
192 return; 193 return;
193 194
194 tabWidget()->remove( currentSession() ); 195 tabWidget()->remove( currentSession() );
195 tabWidget()->setCurrent( m_sessions.first() ); 196 /*it's autodelete */
196 m_sessions.remove( m_curSession ); 197 m_sessions.remove( m_curSession );
197 delete m_curSession;
198 m_curSession = m_sessions.first(); 198 m_curSession = m_sessions.first();
199 tabWidget()->setCurrent( m_curSession );
199} 200}
200 201
201/* 202/*