--- src/gen_list.c	Tue May 16 15:34:18 2006
+++ src/gen_list.c.orig	Tue May 16 12:14:36 2006
@@ -1118,8 +1118,8 @@
    * old and new data are NULL only if file present in both DBs
    * and has not been changed.
    */
-  if( (node->old_data!=NULL || node->new_data!=NULL) &&
-    (file->attr & DB_CHECKINODE)) {
+  if((file->attr & DB_CHECKINODE) &&
+     (node->old_data!=NULL || node->new_data!=NULL)) {
     /* Check if file was moved (same inode, different name in the other DB)*/
     db_line *oldData;
     db_line *newData;
@@ -1155,13 +1155,13 @@
     }
   }
   if( (db == DB_NEW) &&
-      (node->new_data!=NULL) &&
-      (file->attr & DB_NEWFILE) ){
+      (file->attr & DB_NEWFILE) && 
+      (node->new_data!=NULL) ){
 	 node->checked|=NODE_ALLOW_NEW;
   }
   if( (db == DB_OLD) &&
-      (node->old_data!=NULL) &&
-      (file->attr & DB_RMFILE) ){
+      (file->attr & DB_RMFILE) &&
+      (node->old_data!=NULL) ){
 	  node->checked|=NODE_ALLOW_RM;
   }
 }