Apply patch from Richard Mortimer to ensure that the number

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

diff --git a/bacula/src/stored/autochanger.c b/bacula/src/stored/autochanger.c
index f2bd9fd1fc69fa0638ea25d7f64873240949fe69..5de6cb60b06fb4b69a3609196cb2dc3472ce9ea9 100644 (file)
--- a/bacula/src/stored/autochanger.c
+++ b/bacula/src/stored/autochanger.c
@@ -105,7 +105,7 @@ int autoload_device(DCR *dcr, int writing, BSOCK *dir)
    POOLMEM *changer;
 
    if (!dev->is_autochanger()) {
-      Dmsg0(200, "======== NOT AUTOCHANGER ======\n");
+      Dmsg0(200, "== NOT AUTOCHANGER ==\n");
       return 0;
    }
    slot = dcr->VolCatInfo.InChanger ? dcr->VolCatInfo.Slot : 0;
@@ -332,8 +332,9 @@ bool unload_autochanger(DCR *dcr, int loaded)
          Jmsg(jcr, M_INFO, 0, _("3995 Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n"),
                  slot, dev->drive_index, be.strerror());
          ok = false;
+         dev->Slot = -1;           /* unknown */
       } else {
-         dev->Slot = -1;           /* unknown */ 
+         dev->Slot = 0;            /* nothing loaded */
       }
       free_pool_memory(changer);
       unlock_changer(dcr);
@@ -431,8 +432,9 @@ static bool unload_other_drive(DCR *dcr, int slot)
       Dmsg3(100, "Bad autochanger \"unload slot %d, drive %d\": ERR=%s.\n",
               slot, dev->drive_index, be.strerror());
       ok = false;
+      dev->Slot = -1;          /* unknown */
    } else {
-      dev->Slot = -1;           /* nothing loaded */
+      dev->Slot = 0;           /* nothing loaded */
       Dmsg0(100, "Slot unloaded\n");
    }
    unlock_changer(dcr);