[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:       2004-09-16 14:00:24
Message-ID: 20040916140024.B7C469962 () office ! kde ! org
[Download RAW message or body]

CVS commit by trueg: 

open device read-only in case opening read/write fails


  M +3 -0      ChangeLog   1.64.2.62
  M +2 -2      src/main.cpp   1.73.2.17
  M +6 -2      src/device/k3bdevice.cpp   1.87.2.28


--- kdeextragear-1/k3b/ChangeLog  #1.64.2.61:1.64.2.62
@@ -1,2 +1,5 @@
+0.11.16
+Open the device read-only in case opening read/write failes.
+
 0.11.15
 Fixed writer detection issues with kernel >= 2.6.8 (this only means that K3b now \
openes the device

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

--- kdeextragear-1/k3b/src/device/k3bdevice.cpp  #1.87.2.27:1.87.2.28
@@ -95,6 +95,10 @@ int K3bCdDevice::openDevice( const char*
 
   if( fd < 0 ) {
-    kdDebug() << "(K3bDevice::Device) Error: could not open device " << name << \
endl; +    kdDebug() << "(K3bDevice::Device) Error: could not open device " 
+              << name << ( write ? "for writing" : "for reading" ) << endl;
     fd = -1;
+
+    if( write )
+      return openDevice( name, false );
   }
 


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