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

List:       kde-commits
Subject:    kdepim/kmail
From:       Ingo Klöcker <kloecker () kde ! org>
Date:       2004-06-11 21:51:36
Message-ID: 20040611215136.0653A126EB () office ! kde ! org
[Download RAW message or body]

CVS commit by kloecker: 

Fix bug 83235 (Kmail crashes on startup). Don't call updateIndexStreamPtr() if the \
index file could not be opened.


  M +3 -2      kmfoldermaildir.cpp   1.93
  M +4 -1      kmfoldermbox.cpp   1.108


--- kdepim/kmail/kmfoldermaildir.cpp  #1.92:1.93
@@ -113,8 +113,9 @@ int KMFolderMaildir::open()
     } else {
       mIndexStream = fopen(QFile::encodeName(indexLocation()), "r+"); // index file
-      if ( mIndexStream )
+      if ( mIndexStream ) {
         fcntl(fileno(mIndexStream), F_SETFD, FD_CLOEXEC);
       updateIndexStreamPtr();
     }
+    }
 
     if (!mIndexStream)

--- kdepim/kmail/kmfoldermbox.cpp  #1.107:1.108
@@ -144,6 +144,9 @@ int KMFolderMbox::open()
      } else {
        mIndexStream = fopen(QFile::encodeName(indexLocation()), "r+"); // index file
+       if ( mIndexStream ) {
+         fcntl(fileno(mIndexStream), F_SETFD, FD_CLOEXEC);
        updateIndexStreamPtr();
      }
+     }
 
      if (!mIndexStream)


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