Index: trunk/Ohana/src/addstar/src/gimages.c
===================================================================
--- trunk/Ohana/src/addstar/src/gimages.c	(revision 3645)
+++ trunk/Ohana/src/addstar/src/gimages.c	(revision 3649)
@@ -17,5 +17,7 @@
   
   /* if image.db is opened successfully, f will not be NULL.
-     if image.db is empty, dbstate will be LCK_EMPTY */
+     if image.db is empty, dbstate will be LCK_EMPTY 
+     if image.db is not locked & opened successfully, we will not reach here!
+  */
   f = GetDB (&dbstate);
   if (dbstate == LCK_EMPTY) {
Index: trunk/Ohana/src/addstar/src/image-db.c
===================================================================
--- trunk/Ohana/src/addstar/src/image-db.c	(revision 3645)
+++ trunk/Ohana/src/addstar/src/image-db.c	(revision 3649)
@@ -36,5 +36,5 @@
   check_permissions (ImageCat);
   f = fsetlockfile (ImageCat, 3600.0, LOCK, &dbstate);
-  if ((f == (FILE *) NULL) && (dbstate != LCK_EMPTY)) {
+  if (f == NULL) {
     fprintf (stderr, "ERROR: can't lock image catalog\n");
     exit (1);