From 95f0d67dfe0422e71fb97048e451c7e5062d182c Mon Sep 17 00:00:00 2001 From: Hombre Date: Tue, 27 Dec 2016 14:31:55 +0100 Subject: [PATCH] Fix issue #3532 + a memory leak --- rtgui/editorpanel.cc | 5 +++-- rtgui/preferences.cc | 3 +-- rtgui/rtwindow.cc | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc index 8dba7e38e..4ba581ddd 100644 --- a/rtgui/editorpanel.cc +++ b/rtgui/editorpanel.cc @@ -1639,8 +1639,7 @@ void EditorPanel::saveAsPressed () fnameOut = saveAsDialog->getFileName (); options.lastSaveAsPath = saveAsDialog->getDirectory (); - options.saveAsDialogWidth = saveAsDialog->get_width (); - options.saveAsDialogHeight = saveAsDialog->get_height (); + saveAsDialog->get_size(options.saveAsDialogWidth, options.saveAsDialogHeight); options.autoSuffix = saveAsDialog->getAutoSuffix (); options.saveMethodNum = saveAsDialog->getSaveMethodNum (); lastSaveAsFileName = Glib::path_get_basename (removeExtension (fnameOut)); @@ -1709,6 +1708,8 @@ void EditorPanel::saveAsPressed () } while (!fnameOK); saveAsDialog->hide(); + + delete saveAsDialog; } void EditorPanel::queueImgPressed () diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 748531f15..30d9d5ed2 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -105,8 +105,7 @@ Preferences::~Preferences () { profileStore.removeListener(this); - options.preferencesWidth = get_width(); - options.preferencesHeight = get_height(); + get_size(options.preferencesWidth, options.preferencesHeight); } Gtk::Widget* Preferences::getBatchProcPanel () diff --git a/rtgui/rtwindow.cc b/rtgui/rtwindow.cc index b9538ceca..de5bbee43 100644 --- a/rtgui/rtwindow.cc +++ b/rtgui/rtwindow.cc @@ -690,8 +690,7 @@ bool RTWindow::on_delete_event(GdkEventAny* event) ProfilePanel::cleanup(); if (!options.windowMaximized) { - options.windowWidth = get_width(); - options.windowHeight = get_height(); + get_size(options.windowWidth, options.windowHeight); get_position (options.windowX, options.windowY); }