-rw-r--r-- | noncore/apps/opie-console/io_serial.cpp | 3 | ||||
-rw-r--r-- | noncore/apps/opie-console/mainwindow.cpp | 7 |
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 | |||
@@ -7,2 +7,4 @@ | |||
7 | IOSerial::IOSerial(const Profile &config) : IOLayer(config) { | 7 | IOSerial::IOSerial(const Profile &config) : IOLayer(config) { |
8 | m_read = 0l; | ||
9 | m_error = 0l; | ||
8 | m_fd = 0; | 10 | m_fd = 0; |
@@ -114,2 +116,3 @@ bool IOSerial::open() { | |||
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; |
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 | |||
@@ -71,3 +71,3 @@ void MainWindow::initUI() { | |||
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() ) ); |
@@ -190,2 +190,3 @@ void MainWindow::slotConfigure() { | |||
190 | void MainWindow::slotClose() { | 190 | void MainWindow::slotClose() { |
191 | qWarning("close"); | ||
191 | if (!currentSession() ) | 192 | if (!currentSession() ) |
@@ -194,6 +195,6 @@ void MainWindow::slotClose() { | |||
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 | } |