X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Ffiled%2Fjob.c;h=e81f608342c3203ca1079fa4f0d21b4e3cdb9e32;hb=9471da7e0b684cb2da6a5bc4ecb3a73cc3ddac52;hp=769beb62679324f6803818cba09cf493bffcb60d;hpb=7e12e363685d25bf9a2bca58ea1b9cbc54be599f;p=bacula%2Fbacula

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 769beb6267..e81f608342 100644
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -452,13 +452,13 @@ static int cancel_cmd(JCR *jcr)
       if (!(cjcr=get_jcr_by_full_name(Job))) {
          dir->fsend(_("2901 Job %s not found.\n"), Job);
       } else {
+         generate_plugin_event(cjcr, bEventCancelCommand, NULL);
+         set_jcr_job_status(cjcr, JS_Canceled);
          if (cjcr->store_bsock) {
             cjcr->store_bsock->set_timed_out();
             cjcr->store_bsock->set_terminated();
             cjcr->my_thread_send_signal(TIMEOUT_SIGNAL);
          }
-         generate_plugin_event(cjcr, bEventCancelCommand, NULL);
-         set_jcr_job_status(cjcr, JS_Canceled);
          free_jcr(cjcr);
          dir->fsend(_("2001 Job %s marked to be canceled.\n"), Job);
       }
@@ -1907,6 +1907,7 @@ cleanup:
 #if defined(WIN32_VSS)
    if (jcr->VSS) {
       Win32ConvCleanupCache();
+      g_pVSSClient->DestroyWriterInfo();
       V(vss_mutex);
    }
 #endif