Restore JobIds in right order + Tru64 porting

[bacula/bacula] / bacula / src / filed / backup.c

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index 8680c9ea64e86cfaacd962b27e5ebeb6fe7cade0..aa9d4a191619d6f36c624a6de7e1d91b778bd075 100644 (file)
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -239,10 +239,16 @@ static int save_file(FF_PKT *ff_pkt, void *vjcr)
          Jmsg(jcr, M_NOTSAVED, -1, _("     Cannot open %s: ERR=%s.\n"), ff_pkt->fname, 
              berror(&ff_pkt->bfd));
         jcr->Errors++;
-        stop_thread_timer(tid);
+        if (tid) {
+           stop_thread_timer(tid);
+           tid = NULL;
+        }
         return 1;
       }
-      stop_thread_timer(tid);
+      if (tid) {
+        stop_thread_timer(tid);
+        tid = NULL;
+      }
    }
 
    Dmsg1(130, "bfiled: sending %s to stored\n", ff_pkt->fname);