merge with dev

2018-12-19 15:16:18 +01:00
parent 9f28cdf5ba 39d37a6ded
commit c3bd22f337
122 changed files with 1277 additions and 8235 deletions
--- a/rtgui/profilepanel.cc
+++ b/rtgui/profilepanel.cc
@@ -167,6 +167,7 @@ Gtk::TreeIter ProfilePanel::getLastSavedRow()
 Gtk::TreeIter ProfilePanel::addCustomRow()
 {
    if(customPSE) {
+        profiles->deleteRow(customPSE);
        delete customPSE;
        customPSE = nullptr;
    }
@@ -179,6 +180,7 @@ Gtk::TreeIter ProfilePanel::addCustomRow()
 Gtk::TreeIter ProfilePanel::addLastSavedRow()
 {
    if(lastSavedPSE) {
+        profiles->deleteRow(lastSavedPSE);
        delete lastSavedPSE;
        lastSavedPSE = nullptr;
    }