First cut restore GUI

[bacula/bacula] / bacula / src / dird / ua_restore.c

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 14764bbbfaca8093500cc41ec4275a3139e33da1..a79eb8b0fc039efbf84e110817aaebbd7b37e749 100644 (file)
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -176,7 +176,9 @@ int restore_cmd(UAContext *ua, char *cmd)
          bsendmsg(ua, _("Unable to construct a valid BSR. Cannot continue.\n"));
         goto bail_out;
       }
-      write_bsr_file(ua, rx.bsr);
+      if (!write_bsr_file(ua, rx.bsr)) {
+        goto bail_out;
+      }
       bsendmsg(ua, _("\n%u file%s selected to be restored.\n\n"), rx.selected_files,
          rx.selected_files==1?"":"s");
    } else {
@@ -307,9 +309,10 @@ static int user_select_jobids_or_files(UAContext *ua, RESTORE_CTX *rx)
       "pool",      /* 5 */
       "client",    /* 6 */
       "storage",   /* 7 */
-      "where",     /* 8 */
-      "all",       /* 9 */
-      "yes",       /* 10 */
+      "fileset",   /* 8 */
+      "where",     /* 9 */
+      "all",       /* 10 */
+      "yes",       /* 11 */
       NULL
    };