Browse Source

Quick fix to incorrect error messages when writing to compressed or encrypted files.

(cherry picked from commit c65f097ebd6be6743f4fa8fd27d4d82bbd28d005)
Andy Savage 4 years ago
parent
commit
d097c0213c
2 changed files with 5 additions and 5 deletions
  1. 2 2
      core/io/file_access_compressed.cpp
  2. 3 3
      core/io/file_access_encrypted.cpp

+ 2 - 2
core/io/file_access_compressed.cpp

@@ -345,7 +345,7 @@ Error FileAccessCompressed::get_error() const {
 
 
 void FileAccessCompressed::flush() {
 void FileAccessCompressed::flush() {
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
-	ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
+	ERR_FAIL_COND_MSG(!writing, "File has not been opened in write mode.");
 
 
 	// compressed files keep data in memory till close()
 	// compressed files keep data in memory till close()
 }
 }
@@ -353,7 +353,7 @@ void FileAccessCompressed::flush() {
 void FileAccessCompressed::store_8(uint8_t p_dest) {
 void FileAccessCompressed::store_8(uint8_t p_dest) {
 
 
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
 	ERR_FAIL_COND_MSG(!f, "File must be opened before use.");
-	ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
+	ERR_FAIL_COND_MSG(!writing, "File has not been opened in write mode.");
 
 
 	WRITE_FIT(1);
 	WRITE_FIT(1);
 	write_ptr[write_pos++] = p_dest;
 	write_ptr[write_pos++] = p_dest;

+ 3 - 3
core/io/file_access_encrypted.cpp

@@ -255,7 +255,7 @@ Error FileAccessEncrypted::get_error() const {
 
 
 void FileAccessEncrypted::store_buffer(const uint8_t *p_src, int p_length) {
 void FileAccessEncrypted::store_buffer(const uint8_t *p_src, int p_length) {
 
 
-	ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
+	ERR_FAIL_COND_MSG(!writing, "File has not been opened in write mode.");
 
 
 	if (pos < data.size()) {
 	if (pos < data.size()) {
 
 
@@ -275,14 +275,14 @@ void FileAccessEncrypted::store_buffer(const uint8_t *p_src, int p_length) {
 }
 }
 
 
 void FileAccessEncrypted::flush() {
 void FileAccessEncrypted::flush() {
-	ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
+	ERR_FAIL_COND_MSG(!writing, "File has not been opened in write mode.");
 
 
 	// encrypted files keep data in memory till close()
 	// encrypted files keep data in memory till close()
 }
 }
 
 
 void FileAccessEncrypted::store_8(uint8_t p_dest) {
 void FileAccessEncrypted::store_8(uint8_t p_dest) {
 
 
-	ERR_FAIL_COND_MSG(!writing, "File has not been opened in read mode.");
+	ERR_FAIL_COND_MSG(!writing, "File has not been opened in write mode.");
 
 
 	if (pos < data.size()) {
 	if (pos < data.size()) {
 		data.write[pos] = p_dest;
 		data.write[pos] = p_dest;