[aseprite] 87/308: Show correct user data after undo/redo and commit change immediately

[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 f27836744fa56e3abc79cce7c02c8dc5828f6040
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Dec 11 13:58:32 2015 -0300

    Show correct user data after undo/redo and commit change immediately
---
 src/app/commands/cmd_cel_properties.cpp   | 3 ++-
 src/app/commands/cmd_layer_properties.cpp | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/app/commands/cmd_cel_properties.cpp b/src/app/commands/cmd_cel_properties.cpp
index cffa867..5c2fd72 100644
--- a/src/app/commands/cmd_cel_properties.cpp
+++ b/src/app/commands/cmd_cel_properties.cpp
@@ -195,8 +195,9 @@ private:
 
   void onPopupUserData() {
     if (m_cel) {
+      m_userData = m_cel->data()->userData();
       if (show_user_data_popup(userData()->bounds(), m_userData)) {
-        onStartTimer();
+        onCommitChange();
       }
     }
   }
diff --git a/src/app/commands/cmd_layer_properties.cpp b/src/app/commands/cmd_layer_properties.cpp
index 18bfb99..5442ca9 100644
--- a/src/app/commands/cmd_layer_properties.cpp
+++ b/src/app/commands/cmd_layer_properties.cpp
@@ -96,7 +96,6 @@ public:
   }
 
   void setLayer(LayerImage* layer) {
-    // Save uncommited changes
     if (m_layer) {
       document()->removeObserver(this);
       m_layer = nullptr;
@@ -233,8 +232,9 @@ private:
 
   void onPopupUserData() {
     if (m_layer) {
+      m_userData = m_layer->userData();
       if (show_user_data_popup(userData()->bounds(), m_userData)) {
-        onStartTimer();
+        onCommitChange();
       }
     }
   }

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