From 14378f39af5934796b65f5fb1d0310d6c8c4efaf Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 16 Sep 2017 12:37:58 +0200 Subject: [PATCH] Finally fixes #2494 --- rtgui/editorpanel.cc | 7 ++----- rtgui/editorpanel.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 4ea4e5099..f3e6189ba 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -1722,7 +1722,7 @@ void EditorPanel::procParamsChanged (Thumbnail* thm, int whoChangedIt) } } -bool EditorPanel::idle_saveImage (ProgressConnector *pc, Glib::ustring fname, SaveFormat sf) +bool EditorPanel::idle_saveImage (ProgressConnector *pc, Glib::ustring fname, SaveFormat sf, rtengine::procparams::ProcParams &pparams) { rtengine::IImage16* img = pc->returnValue(); delete pc; @@ -1734,9 +1734,6 @@ bool EditorPanel::idle_saveImage (ProgressConnector *pc, Gl ProgressConnector *ld = new ProgressConnector(); img->setSaveProgressListener (parent->getProgressListener()); - rtengine::procparams::ProcParams pparams; - ipc->getParams (&pparams); - if (sf.format == "tif") ld->startFunc (sigc::bind (sigc::mem_fun (img, &rtengine::IImage16::saveAsTIFF), fname, sf.tiffBits, sf.tiffUncompressed), sigc::bind (sigc::mem_fun (*this, &EditorPanel::idle_imageSaved), ld, img, fname, sf, pparams)); @@ -1892,7 +1889,7 @@ void EditorPanel::saveAsPressed () ProgressConnector *ld = new ProgressConnector(); ld->startFunc (sigc::bind (sigc::ptr_fun (&rtengine::processImage), job, err, parent->getProgressListener(), options.tunnelMetaData, false ), - sigc::bind (sigc::mem_fun ( *this, &EditorPanel::idle_saveImage ), ld, fnameOut, sf )); + sigc::bind (sigc::mem_fun ( *this, &EditorPanel::idle_saveImage ), ld, fnameOut, sf, pparams)); saveimgas->set_sensitive (false); sendtogimp->set_sensitive (false); } diff --git a/rtgui/editorpanel.h b/rtgui/editorpanel.h index f01c43cde..9c063661a 100644 --- a/rtgui/editorpanel.h +++ b/rtgui/editorpanel.h @@ -147,7 +147,7 @@ private: BatchQueueEntry* createBatchQueueEntry (); bool idle_imageSaved (ProgressConnector *pc, rtengine::IImage16* img, Glib::ustring fname, SaveFormat sf, rtengine::procparams::ProcParams &pparams); - bool idle_saveImage (ProgressConnector *pc, Glib::ustring fname, SaveFormat sf); + bool idle_saveImage (ProgressConnector *pc, Glib::ustring fname, SaveFormat sf, rtengine::procparams::ProcParams &pparams); bool idle_sendToGimp ( ProgressConnector *pc, Glib::ustring fname); bool idle_sentToGimp (ProgressConnector *pc, rtengine::IImage16* img, Glib::ustring filename);