3 files changed, 7 insertions, 7 deletions

diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 8525109..ef7ffcf 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -222,7 +222,7 @@ void WellenreiterMainWindow::changedSniffingState()
     stopButton->setEnabled( mw->sniffing );
     menuBar()->setItemEnabled( stopID, mw->sniffing );
 
-    if ( !mw->sniffing )
+    if ( !mw->sniffing && QFile::exists( mw->dumpname ) )
     {
         menuBar()->setItemEnabled( uploadID, true );
         uploadButton->setEnabled( true );
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp
index fe8f22d..2f85790 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.cpp
+++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp
@@ -113,6 +113,7 @@ void Wellenreiter::signalHandler( int sig )
     oerr << "Aye! Received SIGSEGV or SIGBUS! Trying to exit gracefully..." << oendl;
     if ( Wellenreiter::instance->sniffing )
     {
+        Wellenreiter::instance->pcap->closeDumpFile();
         Wellenreiter::instance->pcap->close();
         Wellenreiter::instance->stopClicked();
     }
@@ -622,18 +623,17 @@ void Wellenreiter::startClicked()
         dumpname.append( QTime::currentTime().toString().replace( QRegExp( ":" ), "-" ) );
         dumpname.append( ".wellenreiter" );
     }
-    else // write it anyway ;)
-    {
-        dumpname = "/var/log/dump.wellenreiter";
-    }
 
     if ( cardtype != DEVTYPE_FILE )
         pcap->open( interface );
     else
         pcap->openCaptureFile( interface );
 
-    odebug << "Wellenreiter:: dumping to " << dumpname << "" << oendl;
+    if ( configwindow->writeCaptureFile->isChecked() )
+    {
+        odebug << "Wellenreiter:: dumping to " << dumpname << oendl;
     pcap->openDumpFile( dumpname );
+    }
 
     if ( !pcap->isOpen() )
     {
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h
index 32e5690..f582a5f 100644
--- a/noncore/net/wellenreiter/gui/wellenreiter.h
+++ b/noncore/net/wellenreiter/gui/wellenreiter.h
@@ -55,6 +55,7 @@ class Wellenreiter : public WellenreiterBase {
     QString captureFileName() const { return dumpname; };
 
   public:
+    QString dumpname;
     bool sniffing;
     static Wellenreiter* instance;
     static void signalHandler( int sig );
@@ -97,7 +98,6 @@ class Wellenreiter : public WellenreiterBase {
     Opie::Core::OSystem _system;                // Opie Operating System identifier
     #endif
 
-    QString dumpname;
     Opie::Net::OWirelessNetworkInterface* iface;
     Opie::Net::OPacketCapturer* pcap;
     WellenreiterConfigWindow* configwindow;