kes Apply Richard Mortimer's patches for printing an error

[bacula/bacula] / bacula / src / stored / spool.c

diff --git a/bacula/src/stored/spool.c b/bacula/src/stored/spool.c
index 25f8a8a9def904d973518dffaefed7d2783c7391..d79b0f08578210ecfa5dbbee02a095d39db77787 100644 (file)
--- a/bacula/src/stored/spool.c
+++ b/bacula/src/stored/spool.c
@@ -92,7 +92,7 @@ void list_spool_stats(void sendit(const char *msg, int len, void *sarg), void *a
 bool begin_data_spool(DCR *dcr)
 {
    bool stat = true;
-   if (dcr->jcr->spool_data) {
+   if (!dcr->dev->is_dvd() && dcr->jcr->spool_data) {
       Dmsg0(100, "Turning on data spooling\n");
       dcr->spool_data = true;
       stat = open_data_spool_file(dcr);
@@ -248,7 +248,7 @@ static bool despool_data(DCR *dcr, bool commit)
    lseek(rdcr->spool_fd, 0, SEEK_SET); /* rewind */
 
    /* Add run time, to get current wait time */
-   time_t despool_start = time(NULL) + jcr->run_time;
+   time_t despool_start = time(NULL) - jcr->run_time;
 
    for ( ; ok; ) {
       if (job_canceled(jcr)) {