Merge branch 'dev' into metadata-exiv2
- Rating (#5325) not yet implemented
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with RawTherapee. If not, see <http://www.gnu.org/licenses/>.
|
||||
* along with RawTherapee. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "editorpanel.h"
|
||||
|
||||
@@ -1090,7 +1090,7 @@ void EditorPanel::close ()
|
||||
if (iareapanel) {
|
||||
iareapanel->imageArea->setPreviewHandler (nullptr);
|
||||
iareapanel->imageArea->setImProcCoordinator (nullptr);
|
||||
iareapanel->imageArea->unsubscribe();
|
||||
tpc->editModeSwitchedOff();
|
||||
}
|
||||
|
||||
rtengine::StagedImageProcessor::destroy (ipc);
|
||||
@@ -1377,7 +1377,7 @@ void EditorPanel::info_toggled ()
|
||||
infoString = M ("QINFO_NOEXIF");
|
||||
}
|
||||
|
||||
iareapanel->imageArea->setInfoText (infoString);
|
||||
iareapanel->imageArea->setInfoText (std::move(infoString));
|
||||
iareapanel->imageArea->infoEnabled (info->get_active ());
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user