Working on 1796971: Make dialog_save_as() return a bool saying whether it saved anyth...

git-svn-id: http://svn.voria.com/code@723 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index a82c89b..fc45528 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -202,15 +202,12 @@ studio::Instance::save()
        // and will be changed to an absolute path once it has been saved
        // so if it still begins with "Synfig Animation " then we need to ask where to save it
        if(get_file_name().find(DEFAULT_FILENAME_PREFIX)==0)
-       {
-               dialog_save_as();
-               return true;
-       }
+               return dialog_save_as();
 
        return synfigapp::Instance::save();
 }
 
-void
+bool
 studio::Instance::dialog_save_as()
 {
        string filename=basename(get_file_name());
@@ -234,7 +231,7 @@ studio::Instance::dialog_save_as()
                                                "other files first before trying to use \"SaveAs\"."
                                        );
 
-                                       return;
+                                       return false;
                                }
                                if(parent_layer)
                                        break;
@@ -287,10 +284,12 @@ studio::Instance::dialog_save_as()
                }
 
                if(save_as(filename))
-                       break;
+                       return true;
 
                App::dialog_error_blocking("SaveAs - Error","Unable to save file");
        }
+
+       return false;
 }
 
 void

diff --git a/synfig-studio/trunk/src/gtkmm/instance.h b/synfig-studio/trunk/src/gtkmm/instance.h
index 2768fac..b7cc495 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/instance.h
+++ b/synfig-studio/trunk/src/gtkmm/instance.h
@@ -171,7 +171,8 @@ public:
        bool save_as(const synfig::String &filename);
 
        //! Opens a "Save As" dialog, and then saves the composition to that file
-       void dialog_save_as();
+       //! returns true if the save was successful
+       bool dialog_save_as();
 
        bool save();