 -      edit_uint64(jcr->JobBytes, ed2), jcr->Errors, 0,
 -      jcr->pki_encrypt);
 -   Dmsg1(110, "End FD msg: %s\n", dir->msg);
-+   job_end(jcr);
+-
+-   /* Inform Director that we are done */
+-   bnet_sig(dir, BNET_TERMINATE);
+    return 0;                          /* return and terminate command loop */
+ }
  
-    /* Inform Director that we are done */
-    bnet_sig(dir, BNET_TERMINATE);
-@@ -1696,13 +1700,9 @@
+@@ -1609,7 +1602,6 @@
+    bool use_regexwhere=false;
+    int prefix_links;
+    char replace;
+-   char ed1[50], ed2[50];
+ 
+    /*
+     * Scan WHERE (base directory for restore) from command
+@@ -1696,16 +1688,7 @@
     if (jcr->Errors) {
        set_jcr_job_status(jcr, JS_ErrorTerminated);
     }

-      jcr->pki_encrypt);
-   Dmsg1(110, "End FD msg: %s\n", dir->msg);
-   
+   job_end(jcr);
+
    return 0;                          /* return and stop command loop */
 }
 
@@ -1585,12 +1594,7 @@
 
    bnet_sig(dir, BNET_EOD);
 

       if (g_pVSSClient->CloseBackup()) {             
          /* inform user about writer states */
          for (int i=0; i<(int)g_pVSSClient->GetWriterCount(); i++) {
@@ -1504,12 +1512,6 @@
    }
 #endif
 
