src: Actually fix zips

src/movie-bk2.cpp

@@ -238,7 +238,6 @@ void MovieBK2::close() {
 		if (!m_state.empty()) {
 			auto state = m_zip->openFile("Core.bin", true);
 			state->write(m_state.data(), m_state.size());
-			state->flush();
 		}
 	}
 	m_zip->close();

src/zipfile.cpp

@@ -22,9 +22,12 @@ void Zip::close() {
 	if (!m_zip) {
 		return;
 	}
-	m_files.clear();
+	for (auto& file : m_files) {
+		file->close();
+	}
 	zip_close(m_zip);
 	m_zip = nullptr;
+	m_files.clear();
 }
 
 Zip::File* Zip::openFile(const std::string& name, bool write) {
@@ -51,14 +54,6 @@ Zip::File::File(zip_t* zip, const std::string& name, zip_file_t* file)
 	, m_name(name) {
 }
 
-Zip::File::~File() {
-	if (m_file) {
-		zip_fclose(m_file);
-	} else {
-		flush();
-	}
-}
-
 string Zip::File::readline() {
 	auto pos = m_buffer.end();
 	pos = find(m_buffer.begin(), m_buffer.end(), '\n');
@@ -97,17 +92,17 @@ ssize_t Zip::File::write(const void* buffer, size_t size) {
 	return size;
 }
 
-bool Zip::File::flush() {
-	if (!m_buffer.size()) {
-		return false;
-	}
-	zip_source_t* source = zip_source_buffer(m_zip, static_cast<void*>(&m_buffer.front()), m_buffer.size(), 0);
-	if (!source) {
-		return false;
-	}
-	zip_int64_t i = zip_file_add(m_zip, m_name.c_str(), source, ZIP_FL_OVERWRITE);
-	if (i < 0) {
-		return false;
+void Zip::File::close() {
+	if (m_file) {
+		zip_fclose(m_file);
+	} else if (m_buffer.size()) {
+		zip_source_t* source = zip_source_buffer(m_zip, static_cast<void*>(&m_buffer.front()), m_buffer.size(), 0);
+		if (!source) {
+			return;
+		}
+		zip_int64_t i = zip_file_add(m_zip, m_name.c_str(), source, ZIP_FL_OVERWRITE);
+		if (i < 0) {
+			return;
+		}
 	}
-	return true;
 }

src/zipfile.h

@@ -14,15 +14,15 @@ public:
 	public:
 		File(zip_t*, const std::string& name, zip_file_t* = nullptr);
 		File(File&) = delete;
-		~File();
 
 		std::string readline();
 		ssize_t read(void* buffer, size_t size);
 		ssize_t write(const void* buffer, size_t size);
 
-		bool flush();
-
 	private:
+		void close();
+		friend class Zip;
+
 		zip_t* m_zip;
 		zip_file_t* m_file;
 		std::vector<char> m_buffer;