liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into release5.4

Browse Source
This commit is contained in:
Morgan Hardwood 2018-02-07 00:58:54 +01:00
commit 5236a27f44
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtgui/saveasdlg.cc
View File

@ -280,8 +280,6 @@ void SaveAsDialog::okPressed ()
void SaveAsDialog::cancelPressed () void SaveAsDialog::cancelPressed ()
{ {
fname = fchooser->get_filename();
response (Gtk::RESPONSE_CANCEL); response (Gtk::RESPONSE_CANCEL);
} }
@ -297,7 +295,7 @@ void SaveAsDialog::formatChanged (Glib::ustring f)
} }
} }
void SaveAsDialog::setInitialFileName (Glib::ustring fname) void SaveAsDialog::setInitialFileName (const Glib::ustring& fname)
{ {
this->fname = fname; this->fname = fname;
fchooser->set_current_name(fname); fchooser->set_current_name(fname);

2
rtgui/saveasdlg.h
View File

@ -57,7 +57,7 @@ public:
bool getToTailOfQueue (); bool getToTailOfQueue ();
int getSaveMethodNum (); int getSaveMethodNum ();
void setInitialFileName (Glib::ustring iname); void setInitialFileName (const Glib::ustring& iname);
void setImagePath (const Glib::ustring& imagePath); void setImagePath (const Glib::ustring& imagePath);
void okPressed (); void okPressed ();