hrev49226 adds 1 changeset to branch 'master'
old head: b5ab96b2eb8cfde0ea7ee6eea25093712ded99cb
new head: 1639fe99dbbea9204ba8cf5edb5b67697da70b0e
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=1639fe99dbbe+%5Eb5ab96b2eb8c
----------------------------------------------------------------------------
1639fe99dbbe: 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.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev49226
Commit: 1639fe99dbbea9204ba8cf5edb5b67697da70b0e
URL: http://cgit.haiku-os.org/haiku/commit/?id=1639fe99dbbe
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Jun 2 01:17:03 2015 UTC
Ticket: https://dev.haiku-os.org/ticket/12105
----------------------------------------------------------------------------
1 file changed, 6 insertions(+), 1 deletion(-)
src/add-ons/tracker/zipomatic/ZipperThread.cpp | 7 ++++++-
----------------------------------------------------------------------------
diff --git a/src/add-ons/tracker/zipomatic/ZipperThread.cpp
b/src/add-ons/tracker/zipomatic/ZipperThread.cpp
index dfe5d63..b49855e 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);
