[aseprite] 106/308: Keep all frame-related information in filename_formatter() when replaceFrame is false

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 5ca927d307f6a63e894eb63b49a04bac418bcd86
Author: David Capello <davidcapello at gmail.com>
Date:   Mon Dec 14 17:04:16 2015 -0300

    Keep all frame-related information in filename_formatter() when replaceFrame is false
    
    This bug was found in a comment in #897
---
 src/app/filename_formatter.cpp | 6 +++---
 src/app/filename_formatter.h   | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/filename_formatter.cpp b/src/app/filename_formatter.cpp
index c518f73..fb34009 100644
--- a/src/app/filename_formatter.cpp
+++ b/src/app/filename_formatter.cpp
@@ -64,11 +64,11 @@ std::string filename_formatter(
   base::replace_string(output, "{title}", base::get_file_title(filename));
   base::replace_string(output, "{extension}", base::get_file_extension(filename));
   base::replace_string(output, "{layer}", info.layerName());
-  base::replace_string(output, "{tag}", info.innerTagName());
-  base::replace_string(output, "{innertag}", info.innerTagName());
-  base::replace_string(output, "{outertag}", info.outerTagName());
 
   if (replaceFrame) {
+    base::replace_string(output, "{tag}", info.innerTagName());
+    base::replace_string(output, "{innertag}", info.innerTagName());
+    base::replace_string(output, "{outertag}", info.outerTagName());
     replace_frame("{frame", info.frame(), output);
     replace_frame("{tagframe", info.tagFrame(), output);
   }
diff --git a/src/app/filename_formatter.h b/src/app/filename_formatter.h
index 4156508..dcda28e 100644
--- a/src/app/filename_formatter.h
+++ b/src/app/filename_formatter.h
@@ -63,6 +63,9 @@ namespace app {
     int m_tagFrame;
   };
 
+  // If "replaceFrame" is false, this function doesn't replace all the
+  // information that depends on the current frame ({frame},
+  // {tagframe}, {tag}, etc.)
   std::string filename_formatter(
     const std::string& format,
     FilenameInfo& info,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git