# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1417224553 -7200
# Node ID 280dc9b01297df5b41a86e1dbe5bc36b6a68bd94
# Parent  003af1c4ae1f949e2bed7977b064f63e03c92043
Moar work.

diff -r 003af1c4ae1f -r 280dc9b01297 faptool.php
--- a/faptool.php	Sat Nov 29 03:08:55 2014 +0200
+++ b/faptool.php	Sat Nov 29 03:29:13 2014 +0200
@@ -385,13 +385,13 @@
   if (wtMakeDir(stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"])), 0755) === false)
     return FALSE;
 
-  $dstFileBase = $useOrig ? $efile["id"]."--".$efile["origname"] : $efile["filename"];
+  $dstFileBase = $entry["show_id"]."--".($useOrig ? $efile["origname"] : $efile["filename"]);
 
   if ($edata["class"] == EFILE_ARCHIVE)
   {
     // Entry is an archive file ..
     $dstPath = stMakePath(FALSE, FALSE, array($pathPrefix, $compo["cpath"], stReplaceFileExt($dstFileBase, "")));
-    if (wtUnpackArchiveTo($efile["filetype"], $filename, $dstPath) === false)
+    if (wtUnpackArchiveTo($edata["id"], $filename, $dstPath) === false)
       return FALSE;
   }
   else