Fix restore objectid= command

The ua->cmd variable is overwritten by the get_client_name() call

diff --git a/bacula/src/dird/ua_restore.c b/bacula/src/dird/ua_restore.c
index 8e764e7f53dc0b77a00562aed027651c4baeb83d..55eb10c4dc95c60edc9aedde57e7d48767e8cd5f 100644 (file)
--- a/bacula/src/dird/ua_restore.c
+++ b/bacula/src/dird/ua_restore.c
@@ -589,13 +589,6 @@ static int select_files_from_plugin_obj(UAContext *ua, OBJECT_DBR *obj_r, RESTOR
       return 0;
    }
 
-   bool dir = obj_r->Filename[0] != 0 ? false : true;
-   if (dir) {
-      pm_strcpy(ua->cmd, obj_r->Path);
-   } else {
-      Mmsg(ua->cmd, "%s%s", obj_r->Path, obj_r->Filename);
-   }
-
    db_list_ctx jobids;
    if (!db_get_accurate_jobids(ua->jcr, ua->db, &jr, &jobids)) {
       return 0;
@@ -612,6 +605,13 @@ static int select_files_from_plugin_obj(UAContext *ua, OBJECT_DBR *obj_r, RESTOR
       return 0;
    }
 
+   bool dir = obj_r->Filename[0] != 0 ? false : true;
+   if (dir) {
+      pm_strcpy(ua->cmd, obj_r->Path);
+   } else {
+      Mmsg(ua->cmd, "%s%s", obj_r->Path, obj_r->Filename);
+   }
+
    insert_one_file_or_dir(ua, rx, jr.cStartTime, dir);
 
    return 1;