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

metadata panel: do not use Gtk::manage for exifpanel and iptcpanel

Browse Source 
(Fixes segfault due to removing the notebook pages in batch mode)
This commit is contained in:
Alberto Griggio 2017-12-30 00:00:12 +01:00
parent b589254d21
commit d7f96c298e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtgui/metadatapanel.cc
View File

@ -43,8 +43,8 @@ MetaDataPanel::MetaDataPanel()
metadataMode->signal_changed().connect(sigc::mem_fun(*this, &MetaDataPanel::metaDataModeChanged)); metadataMode->signal_changed().connect(sigc::mem_fun(*this, &MetaDataPanel::metaDataModeChanged));
tagsNotebook = Gtk::manage(new Gtk::Notebook()); tagsNotebook = Gtk::manage(new Gtk::Notebook());
exifpanel = Gtk::manage(new ExifPanel()); exifpanel = new ExifPanel();
iptcpanel = Gtk::manage(new IPTCPanel()); iptcpanel = new IPTCPanel();
tagsNotebook->set_name("MetaPanelNotebook"); tagsNotebook->set_name("MetaPanelNotebook");
tagsNotebook->append_page(*exifpanel, M("MAIN_TAB_EXIF")); tagsNotebook->append_page(*exifpanel, M("MAIN_TAB_EXIF"));
tagsNotebook->append_page(*iptcpanel, M("MAIN_TAB_IPTC")); tagsNotebook->append_page(*iptcpanel, M("MAIN_TAB_IPTC"));
@ -53,6 +53,13 @@ MetaDataPanel::MetaDataPanel()
} }
MetaDataPanel::~MetaDataPanel()
{
delete iptcpanel;
delete exifpanel;
}
void MetaDataPanel::setBatchMode(bool batchMode) void MetaDataPanel::setBatchMode(bool batchMode)
{ {
ToolPanel::setBatchMode(batchMode); ToolPanel::setBatchMode(batchMode);

1
rtgui/metadatapanel.h
View File

@ -36,6 +36,7 @@ private:
public: public:
MetaDataPanel(); MetaDataPanel();
~MetaDataPanel();
void setBatchMode(bool batchMode); void setBatchMode(bool batchMode);
void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr); void read(const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = nullptr);