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

List:       kde-commits
Subject:    k3b_0_11_branch: kdeextragear-1/k3b
From:       Sebastian Trueg <sebastian () trueg ! de>
Date:       2005-03-26 17:58:37
Message-ID: 20050326175837.36FC6627 () office ! kde ! org
[Download RAW message or body]

CVS commit by trueg: 

0.11.24 started...


  M +4 -0      ChangeLog   1.64.2.83
  M +2 -2      src/main.cpp   1.73.2.26
  M +21 -16    src/dvdcopy/k3bdvdcopyjob.cpp   1.27.2.4


--- kdeextragear-1/k3b/ChangeLog  #1.64.2.82:1.64.2.83
@@ -1,2 +1,6 @@
+0.11.24
+K3b now ejects the source DVD when reader and writer device are the same (no more 
+accidently overwriting the rewritable source DVD)
+
 0.11.23
 Fixed session import.

--- kdeextragear-1/k3b/src/main.cpp  #1.73.2.25:1.73.2.26
@@ -63,5 +63,5 @@ int main(int argc, char *argv[]) {
 
     KAboutData aboutData( "k3b", I18N_NOOP("K3b"),
-                          "0.11.23cvs", description, KAboutData::License_GPL,
+                          "0.11.24cvs", description, KAboutData::License_GPL,
                           I18N_NOOP("(c) 1999 - 2004, Sebastian Trüg and the K3b \
                Team"), 0, "http://www.k3b.org" );
     aboutData.addAuthor("Sebastian Trüg",I18N_NOOP("Maintainer"), "trueg@k3b.org");

--- kdeextragear-1/k3b/src/dvdcopy/k3bdvdcopyjob.cpp  #1.27.2.3:1.27.2.4
@@ -452,5 +452,9 @@ void K3bDvdCopyJob::slotReaderFinished( 
       d->running = false;
     }
-    else if( !m_onTheFly ) {
+    else {
+      if( m_writerDevice == m_readerDevice )
+        m_readerDevice->eject();
+     
+      if( !m_onTheFly ) {
       if( waitForDvd() ) {
         prepareWriter();
@@ -470,4 +474,5 @@ void K3bDvdCopyJob::slotReaderFinished( 
     }
   }
+  }
   else {
     removeImageFiles();


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