[gnome-subtitles] Don't show Translation Save if Save was cancelled



commit 3ed55523271d88ba2d5437cf5a48b287829069e8
Author: Pedro Castro <pedro gnomesubtitles org>
Date:   Sun Nov 11 17:58:30 2018 +0000

    Don't show Translation Save if Save was cancelled
    
    Fixes #117 - Translation Save dialog should not appear after cancelling
    the subtitle File Save dialog

 src/GnomeSubtitles/Core/EventHandlers.cs | 12 ++++++++----
 src/GnomeSubtitles/Ui/MainUi.cs          |  8 ++++----
 2 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/src/GnomeSubtitles/Core/EventHandlers.cs b/src/GnomeSubtitles/Core/EventHandlers.cs
index d9bf53d..b520ad7 100644
--- a/src/GnomeSubtitles/Core/EventHandlers.cs
+++ b/src/GnomeSubtitles/Core/EventHandlers.cs
@@ -45,17 +45,21 @@ public class EventHandlers {
        }
 
        public void OnFileSave (object o, EventArgs args) {
-               Base.Ui.Save();
+               //Save the subtitles
+               Boolean saved = Base.Ui.Save();
 
-               if (Base.Document.IsTranslationLoaded && Base.Config.FileTranslationSaveAll) {
+               //Save the translation
+               if (saved && Base.Document.IsTranslationLoaded && Base.Config.FileTranslationSaveAll) {
                        OnFileTranslationSave(o, args);
                }
        }
 
        public void OnFileSaveAs (object o, EventArgs args) {
-               Base.Ui.SaveAs();
+               //Save the subtitles
+               Boolean saved = Base.Ui.SaveAs();
 
-               if (Base.Document.IsTranslationLoaded && Base.Config.FileTranslationSaveAll) {
+               //Save the translation
+               if (saved && Base.Document.IsTranslationLoaded && Base.Config.FileTranslationSaveAll) {
                        OnFileTranslationSave(o, args);
                }
        }
diff --git a/src/GnomeSubtitles/Ui/MainUi.cs b/src/GnomeSubtitles/Ui/MainUi.cs
index e09563e..38609cd 100644
--- a/src/GnomeSubtitles/Ui/MainUi.cs
+++ b/src/GnomeSubtitles/Ui/MainUi.cs
@@ -197,8 +197,8 @@ public class MainUi {
                        Save(properties);
                        return true;
                }
-               else
-                       return false;
+               
+               return false;
        }
 
        /// <summary>Starts a new translation.</summary>
@@ -254,8 +254,8 @@ public class MainUi {
                        SaveTranslation(properties);
                        return true;
                }
-               else
-                       return false;
+
+               return false;
        }
 
     /// <summary>Closes a translation.</summary>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]