From bf0c609353bab5811f6634b42e5e6ba154357ba3 Mon Sep 17 00:00:00 2001 From: Julia Kartseva Date: Wed, 16 Oct 2024 02:18:59 +0000 Subject: [PATCH] possible conflict w private --- programs/disks/CommandWrite.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/programs/disks/CommandWrite.cpp b/programs/disks/CommandWrite.cpp index f4e1c892aad..1d61809afb6 100644 --- a/programs/disks/CommandWrite.cpp +++ b/programs/disks/CommandWrite.cpp @@ -35,12 +35,13 @@ public: { if (!path_from.has_value()) return std::make_unique(STDIN_FILENO); - String relative_path_from = disk.getRelativeFromRoot(path_from.value()); - auto res = disk.getDisk()->readFileIfExists(relative_path_from, getReadSettings()); - if (res) - return res; - /// For backward compatibility. - return std::make_unique(); + + String relative_path_from = disk.getRelativeFromRoot(path_from.value()); + auto res = disk.getDisk()->readFileIfExists(relative_path_from, getReadSettings()); + if (res) + return res; + /// For backward compatibility. + return std::make_unique(); }(); auto out = disk.getDisk()->writeFile(path_to);