From 78e278c1e33e39eb29a26a976b19ea6a8150bfff Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Wed, 28 Aug 2013 21:52:19 +0200
Subject: Misc tweaks

* Do not nuke forge META-INF
* Disable inner DnD in mod lists on linux.
---
 logic/LegacyUpdate.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'logic/LegacyUpdate.h')

diff --git a/logic/LegacyUpdate.h b/logic/LegacyUpdate.h
index a68d67bb..c94fc4c6 100644
--- a/logic/LegacyUpdate.h
+++ b/logic/LegacyUpdate.h
@@ -48,7 +48,12 @@ private slots:
 	
 	void ModTheJar();
 private:
-	bool MergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString>& contained);
+	enum MetainfAction
+	{
+		KeepMetainf, // the META-INF folder will be added from the merged jar
+		IgnoreMetainf // the META-INF from the merged jar will be ignored
+	};
+	bool MergeZipFiles(QuaZip *into, QFileInfo from, QSet<QString>& contained, MetainfAction metainf);
 private:
 	
 	QSharedPointer<QNetworkReply> m_reply;
-- 
cgit