comparison kdiff3/src/pdiff.cpp @ 50:8c9752066f09

Error-detection for diff-problems improved.

  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * $Log$
+ * Revision 1.3  2003/10/17 16:54:25  joachim99
+ * Error-detection for diff-problems improved.
+ *
  * Revision 1.2  2003/10/11 12:50:38  joachim99
  * KDiff3App::slotRefresh(): Call setFont() for subwindows
  *
  * Revision 1.1  2003/10/06 18:38:48  joachim99
  * KDiff3 version 0.9.70

             }
 
             if ( currentLine1 == size1 && currentLine2 == size2 )
                bSuccess = true;
          }
+         else
+         {
+            bSuccess = size1==size2;
+         }
       }
       if ( currentLine1==0 && currentLine2==0 )
       {
          Diff d( 0, size1, size2 );
          diffList.push_back(d);
       }
 
-      FileAccess::removeFile( fileName1 );
-      FileAccess::removeFile( fileName2 );
-      FileAccess::removeFile( fileNameOut );
       g_pProgressDialog->setSubCurrent(1.0);
 
       if ( !bSuccess )
       {
          KMessageBox::sorry(this,

                  "Check if the diff works, if the program can write in the temp folder or if the disk is full.\n"
                  "The external diff option will be disabled now and the internal diff will be used."),
             i18n("KDiff3 Warning"));
          m_pOptionDialog->m_bUseExternalDiff = false;
       }
+      
+      FileAccess::removeFile( fileName1 );
+      FileAccess::removeFile( fileName2 );
+      FileAccess::removeFile( fileNameOut );
    }
 
    if ( ! m_pOptionDialog->m_bUseExternalDiff )
    {
       g_pProgressDialog->setSubCurrent(0.0);