/[svn]/gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp
ViewVC logotype

Diff of /gigedit/trunk/src/gigedit/CombineInstrumentsDialog.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3456 by persson, Sun Jan 27 10:07:56 2019 UTC revision 3677 by schoenebeck, Thu Dec 26 23:01:09 2019 UTC
# Line 1192  void CombineInstrumentsDialog::onSelecti Line 1192  void CombineInstrumentsDialog::onSelecti
1192      {      {
1193          Children allOrdered = m_refOrderModel->children();          Children allOrdered = m_refOrderModel->children();
1194          for (Children::iterator itOrder = allOrdered.begin();          for (Children::iterator itOrder = allOrdered.begin();
1195               itOrder != allOrdered.end(); ++itOrder)               itOrder != allOrdered.end(); )
1196          {          {
1197              Gtk::TreeModel::Row rowOrder = *itOrder;              Gtk::TreeModel::Row rowOrder = *itOrder;
1198              gig::Instrument* instr = rowOrder[m_orderColumns.m_col_instr];              gig::Instrument* instr = rowOrder[m_orderColumns.m_col_instr];
# Line 1204  void CombineInstrumentsDialog::onSelecti Line 1204  void CombineInstrumentsDialog::onSelecti
1204              }              }
1205              goto removeOrderedItem;              goto removeOrderedItem;
1206          nextOrderedItem:          nextOrderedItem:
1207                ++itOrder;
1208              continue;              continue;
1209          removeOrderedItem:          removeOrderedItem:
1210              m_refOrderModel->erase(itOrder);              // postfix increment here to avoid iterator invalidation
1211                m_refOrderModel->erase(itOrder++);
1212          }          }
1213      }      }
1214    
Legend:
Removed from v.3456  
changed lines
  Added in v.3677
  ViewVC Help
Powered by ViewVC