Calmed down... 2nd try after merge

Use MetaFactory cuase it's so nice and avoids thousands of if() else if
stuff
Fix a bug in filetransfer where cancel after exit leaded to a crash cause
of bogus adresses in the QSocketNotifiers..

1 files changed, 3 insertions, 0 deletions

diff --git a/noncore/apps/opie-console/filetransfer.cpp b/noncore/apps/opie-console/filetransfer.cpp
index b39dc95..8e86ebb 100644
--- a/noncore/apps/opie-console/filetransfer.cpp
+++ b/noncore/apps/opie-console/filetransfer.cpp
@@ -190,8 +190,10 @@ void FileTransfer::slotRead() {
 /*
  * find the progress
  */
 void FileTransfer::slotProgress( const QStringList& list ) {
+    if ( m_type != SZ )
+        return;
     bool complete = true;
     int min, sec;
     int bps;
     unsigned long sent, total;
@@ -241,8 +243,9 @@ void FileTransfer::slotExec() {
     char buf[2];
     ::read(m_term[0], buf, 1 );
     delete m_proc;
     delete m_not;
+    m_proc = m_not = 0l;
     close( m_term[0] );
     close( m_term[1] );
     close( m_comm[0] );
     close( m_comm[1] );