From 55185e531aa9a30d360440d3a2674cc85f8f8057 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Mon, 17 Feb 2014 22:04:09 +0000 Subject: [PATCH] Fixed #113. Turns out the code I thought might be dodgy was in fact dodgy. --- src/gui/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 11f25b0c..b454ac2d 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -750,7 +750,7 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) { } } - progDia->Pulse(); + progDia->Update(800, translate("Building plugin graph...")); /////////////////////////////////////////////////////// // Build Graph Edges & Sort @@ -810,7 +810,7 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) { } else { //Recreate progress dialog. - progDia = new wxProgressDialog(translate("BOSS: Working..."), translate("BOSS working..."), 1000, this, wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_ELAPSED_TIME); + progDia = new wxProgressDialog(translate("BOSS: Working..."), translate("Recalculating load order..."), 1000, this, wxPD_APP_MODAL | wxPD_AUTO_HIDE | wxPD_ELAPSED_TIME); //User accepted edits, now apply them, then loop. //Apply edits to the graph vertices. @@ -825,9 +825,9 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) { } //Clear all existing edges from the graph. - std::pair edge_range = boost::edges(graph); - for (edge_it it = edge_range.first; it != edge_range.second; ++it) { - boost::remove_edge(*it, graph); + BOOST_LOG_TRIVIAL(trace) << "Clearing all existing edges from the plugin graph."; + for (boost::tie(vit, vitend) = boost::vertices(graph); vit != vitend; ++vit) { + boost::clear_vertex(*vit, graph); } //Merge edits down to the userlist entries.