[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdenonbeta/kwintv3/qtvision
From:       Dirk Ziegelmeier <dirk () ziegelmeier ! net>
Date:       2004-01-20 22:04:28
Message-ID: 20040120220428.D88F81A0E () office ! kde ! org
[Download RAW message or body]

CVS commit by dziegel: 

Prevent infinite loop when user presses cancel and no channels are available.
+ too many indent fixes.


  M +150 -143  channelscanner.cpp   1.27


--- kdenonbeta/kwintv3/qtvision/channelscanner.cpp  #1.26:1.27
@@ -256,5 +256,10 @@ ChannelScanner::ChannelScanner( QtVision
     _store = new ChannelStore(_qtv, this, "ResultStore");
 
+    // prevent infinite loop when user presses cancel and there are no channels
+    if ( _qtv->channels()->isEmpty() ) {
+        _prevDev = QString::null;
+    } else {
     _prevDev = _srcm->device();
+    }
 }
 
@@ -357,5 +362,7 @@ void ChannelScanner::reject()
 {
     // restore old state
+    if (!_prevDev.isEmpty()) {
     _qtv->playDevice(_prevDev);
+    }
 
     QDialog::reject();


[prev in list] [next in list] [prev in thread] [next in thread]