Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / missing_file_dialog.cc

diff --git a/gtk2_ardour/missing_file_dialog.cc b/gtk2_ardour/missing_file_dialog.cc
index 8f171947b4e3f7c07a03bcfc1884b391aa00f211..47e694841286f66f4702691d769d38d66e8ade16 100644 (file)
--- a/gtk2_ardour/missing_file_dialog.cc
+++ b/gtk2_ardour/missing_file_dialog.cc
@@ -22,9 +22,10 @@
 #include "pbd/search_path.h"
 
 #include "ardour/session.h"
+#include "gtkmm2ext/utils.h"
 
 #include "missing_file_dialog.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace std;
@@ -41,7 +42,10 @@ MissingFileDialog::MissingFileDialog (Session* s, const std::string& path, DataT
         , all_missing_ok (choice_group, _("Skip all missing files"), false)
         , this_missing_ok (choice_group, _("Skip this file"), false)
 {
-        set_session (s);
+       /* This dialog is always shown programatically. Center the window.*/
+       set_position (Gtk::WIN_POS_CENTER);
+
+       set_session (s);
 
         add_button (_("Done"), RESPONSE_OK);
         set_default_response (RESPONSE_OK);
@@ -68,7 +72,7 @@ MissingFileDialog::MissingFileDialog (Session* s, const std::string& path, DataT
 
         msg.set_justify (JUSTIFY_LEFT);
         msg.set_markup (string_compose (_("%1 cannot find the %2 file\n\n<i>%3</i>\n\nin any of these folders:\n\n\
-<tt>%4</tt>\n\n"), PROGRAM_NAME, typestr, Glib::Markup::escape_text(path), Glib::Markup::escape_text (oss.str())));
+<tt>%4</tt>\n\n"), PROGRAM_NAME, typestr, Gtkmm2ext::markup_escape_text (path), Gtkmm2ext::markup_escape_text (oss.str())));
 
         HBox* hbox = manage (new HBox);
         hbox->pack_start (msg, false, true);