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

Merge branch 'profile-panel-bugfix' into dev

Browse Source
This commit is contained in:
Hombre
2018-12-15 13:12:15 +01:00
parent ddfc67bcd0 71a5521b66
commit cfa3d30698
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtgui/profilepanel.cc
View File

@@ -167,6 +167,7 @@ Gtk::TreeIter ProfilePanel::getLastSavedRow()
Gtk::TreeIter ProfilePanel::addCustomRow() Gtk::TreeIter ProfilePanel::addCustomRow()
{ {
if(customPSE) { if(customPSE) {
profiles->deleteRow(customPSE);
delete customPSE; delete customPSE;
customPSE = nullptr; customPSE = nullptr;
} }
@@ -179,6 +180,7 @@ Gtk::TreeIter ProfilePanel::addCustomRow()
Gtk::TreeIter ProfilePanel::addLastSavedRow() Gtk::TreeIter ProfilePanel::addLastSavedRow()
{ {
if(lastSavedPSE) { if(lastSavedPSE) {
profiles->deleteRow(lastSavedPSE);
delete lastSavedPSE; delete lastSavedPSE;
lastSavedPSE = nullptr; lastSavedPSE = nullptr;
} }

8
rtgui/profilestorecombobox.cc
View File

@@ -356,3 +356,11 @@ Gtk::TreeIter ProfileStoreComboBox::addRow (const ProfileStoreEntry *profileStor
return newEntry; return newEntry;
} }
/** @brief Delete a row from the first level of the tree */
void ProfileStoreComboBox::deleteRow (const ProfileStoreEntry *profileStoreEntry)
{
Gtk::TreeIter entry = findRowFromEntry(profileStoreEntry);
if (entry) {
refTreeModel->erase(entry);
}
}

1
rtgui/profilestorecombobox.h
View File

@@ -90,6 +90,7 @@ public:
bool setInternalEntry (); bool setInternalEntry ();
Gtk::TreeIter getRowFromLabel (Glib::ustring name); Gtk::TreeIter getRowFromLabel (Glib::ustring name);
Gtk::TreeIter addRow (const ProfileStoreEntry *profileStoreEntry); Gtk::TreeIter addRow (const ProfileStoreEntry *profileStoreEntry);
void deleteRow (const ProfileStoreEntry *profileStoreEntry);
}; };
#endif #endif