Merge branch 'develop' into macos-develop

[hengbandforosx/hengbandosx.git] / src / cmd-io / cmd-process-screen.cpp

diff --git a/src/cmd-io/cmd-process-screen.cpp b/src/cmd-io/cmd-process-screen.cpp
index ddc8cd4..fcb8f46 100644 (file)
--- a/src/cmd-io/cmd-process-screen.cpp
+++ b/src/cmd-io/cmd-process-screen.cpp
@@ -204,7 +204,7 @@ static void write_html_footer(FILE *tmpfff, FILE *fff)
 void exe_cmd_save_screen_html(const std::filesystem::path &path, bool need_message)
 {
     const auto &[wid, hgt] = term_get_size();
-    auto *fff = angband_fopen(path, FileOpenMode::WRITE);
+    auto *fff = angband_fopen(path, FileOpenMode::WRITE, false, FileOpenType::HTML);
     if (!check_screen_html_can_open(fff, path, need_message)) {
         return;
     }
@@ -235,11 +235,11 @@ void exe_cmd_save_screen_html(const std::filesystem::path &path, bool need_messa
 static void exe_cmd_save_screen_html_with_naming()
 {
     const auto filename = input_string(_("ファイル名: ", "File name: "), 80, "screen.html");
-    if (!filename.has_value()) {
+    if (!filename) {
         return;
     }
 
-    auto path = path_build(ANGBAND_DIR_USER, filename.value());
+    auto path = path_build(ANGBAND_DIR_USER, *filename);
     msg_print(nullptr);
     exe_cmd_save_screen_html(path, true);
 }