From 93121e8aa32509b6b484d5d4c3b6bee369ce6890 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 11 Mar 2021 19:37:10 +0100 Subject: [PATCH] Revert "Show error when session-archive loading fails" This reverts commit 48225c10bdd5a2546e45fa3efb8ae60c154ffbe8. We need to allow this to fail and fall-through to test normal sessions. --- gtk2_ardour/ardour_ui_session.cc | 2 +- gtk2_ardour/startup_fsm.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gtk2_ardour/ardour_ui_session.cc b/gtk2_ardour/ardour_ui_session.cc index 9c03f514d8..8ac7c9a313 100644 --- a/gtk2_ardour/ardour_ui_session.cc +++ b/gtk2_ardour/ardour_ui_session.cc @@ -182,7 +182,7 @@ ARDOUR_UI::session_dialog_response_handler (int response, SessionDialog* session if (!likely_new) { int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name); - if (rv != 0) { + if (rv < 0) { ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv))); msg.run (); return; /* back to main event loop */ diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc index 7bf5d8b2b2..44e528fcbe 100644 --- a/gtk2_ardour/startup_fsm.cc +++ b/gtk2_ardour/startup_fsm.cc @@ -707,7 +707,7 @@ StartupFSM::check_session_parameters (bool must_be_new) /* See if the specified session is a session archive */ int rv = ARDOUR::inflate_session (session_name, Config->get_default_session_parent_dir(), session_path, session_name); - if (rv != 0) { + if (rv < 0) { ArdourMessageDialog msg (*session_dialog, string_compose (_("Extracting session-archive failed: %1"), inflate_error (rv))); msg.run (); return 1;