updated File Error Handling

daddel80 · Feb 3, 2024 · 325af63 · 325af63
1 parent 0b706fe
commit 325af63
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/MultiReplacePanel.cpp b/src/MultiReplacePanel.cpp
@@ -4358,12 +4358,12 @@ bool MultiReplace::saveListToCsvSilent(const std::wstring& filePath, const std::
     }
 
     outFile.close();
-    return true;
+    return !outFile.fail();;
 }
 
 void MultiReplace::saveListToCsv(const std::wstring& filePath, const std::vector<ReplaceItemData>& list) {
     if (!saveListToCsvSilent(filePath, list)) {
-        showStatusMessage(getLangStr(L"status_unable_to_open_file"), RGB(255, 0, 0));
+        showStatusMessage(getLangStr(L"status_unable_to_save_file"), RGB(255, 0, 0));
         return;
     }
 
@@ -4539,6 +4539,7 @@ std::wstring MultiReplace::unescapeCsvValue(const std::wstring& value) {
 void MultiReplace::exportToBashScript(const std::wstring& fileName) {
     std::ofstream file(fileName);
     if (!file.is_open()) {
+        showStatusMessage(getLangStr(L"status_unable_to_save_file"), RGB(255, 0, 0));
         return;
     }
 

diff --git a/src/language_mapping.cpp b/src/language_mapping.cpp
@@ -108,7 +108,7 @@ std::unordered_map<std::wstring, std::wstring> languageMap = {
 { L"status_invalid_column_number", L"Invalid column number" },
 { L"status_extended_delimiter_empty", L"Extended delimiter is empty" },
 { L"status_invalid_quote_character", L"Invalid quote character. Use \" or ' or leave it empty." },
-{ L"status_unable_to_open_file", L"Error: Unable to open file for writing." },
+{ L"status_unable_to_save_file", L"Error: Unable to open or write to file." },
 { L"status_no_valid_items_in_csv", L"No valid items found in the CSV file." },
 { L"status_list_exported_to_bash", L"List exported to BASH script." },