From 1639fe99dbbea9204ba8cf5edb5b67697da70b0e Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 1 Jun 2015 21:17:03 -0400
Subject: [PATCH] Partially revert "Zip-O-Matic: fix zipping single folder."

This partially reverts commit d1d90b0462faa82489e446a6e25337602939993e.
The real culprit that was causing this issue is #12105, not the
zip/unzip upgrade as originally thought.
---
 src/add-ons/tracker/zipomatic/ZipperThread.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/add-ons/tracker/zipomatic/ZipperThread.cpp b/src/add-ons/tracker/zipomatic/ZipperThread.cpp
index dfe5d6388c..b49855eb14 100644
--- a/src/add-ons/tracker/zipomatic/ZipperThread.cpp
+++ b/src/add-ons/tracker/zipomatic/ZipperThread.cpp
@@ -95,7 +95,12 @@ ZipperThread::ThreadStartup()
 
 	BString archiveName;
 
-	if (gotDirRef || sameFolder) {
+	if (gotDirRef) {
+		BEntry entry(&dirRef);
+		BPath path;
+		entry.GetPath(&path);
+		archiveName = path.Path();
+	} else if (sameFolder) {
 		BEntry entry(&lastRef);
 		BPath path;
 		entry.GetParent(&entry);