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

[ardour.git] / gtk2_ardour / session_import_dialog.cc

diff --git a/gtk2_ardour/session_import_dialog.cc b/gtk2_ardour/session_import_dialog.cc
index cb75b72f947119feb4e463f61a89529db053e7c9..b528f91b6c325f2f69fdd65fc9b26d511a570b88 100644 (file)
--- a/gtk2_ardour/session_import_dialog.cc
+++ b/gtk2_ardour/session_import_dialog.cc
@@ -25,6 +25,7 @@
 #include "ardour/audio_region_importer.h"
 #include "ardour/audio_playlist_importer.h"
 #include "ardour/audio_track_importer.h"
+#include "ardour/filename_extensions.h"
 #include "ardour/location_importer.h"
 #include "ardour/tempo_map_importer.h"
 
@@ -32,7 +33,7 @@
 
 #include "gui_thread.h"
 #include "prompter.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -40,7 +41,7 @@ using namespace PBD;
 using namespace Gtk;
 
 SessionImportDialog::SessionImportDialog (ARDOUR::Session* target) :
-  ArdourDialog (_("Import From Session")),
+  ArdourDialog (_("Import from Session")),
   file_browse_button (_("Browse"))
 {
        set_session (target);
@@ -164,11 +165,11 @@ SessionImportDialog::browse ()
        dialog.set_transient_for(*this);
        dialog.set_filename (file_entry.get_text());
 
-        FileFilter session_filter;
-        session_filter.add_pattern ("*.ardour");
-        session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
-        dialog.add_filter (session_filter);
-        dialog.set_filter (session_filter);
+       FileFilter session_filter;
+       session_filter.add_pattern (string_compose(X_("*%1"), ARDOUR::statefile_suffix));
+       session_filter.set_name (string_compose (_("%1 sessions"), PROGRAM_NAME));
+       dialog.add_filter (session_filter);
+       dialog.set_filter (session_filter);
 
        dialog.add_button(Stock::CANCEL, RESPONSE_CANCEL);
        dialog.add_button(Stock::OK, RESPONSE_OK);