ardour/livetrax
13
0
Fork 0
Code

Log text passed to a dialog needs escaped to avoid markup errors

Browse Source 
For example, the following log text creates a markup error that results in
the session loading dialog being completely empty.

WARNING: VST3<C:\Program Files\Common Files\VST3\Plugins.VST.Someplugin.vst3\Contents\x86-win\Plugins.VST.Someplugin.vst3>: Invalid Module Path
...

Gtk-WARNING **: 16:46:28.447: Failed to set text from markup due to error parsing markup: Error on line 7 char 40: ?Files\Common? is not a valid name: ?\?
This commit is contained in:
Todd Naugle 2022-02-23 10:25:15 -06:00
parent 8408d5916c
commit 2217e8d9ce
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gtk2_ardour/ardour_ui_session.cc
View File

@ -416,13 +416,20 @@ ARDOUR_UI::load_session_stage_two (const std::string& path, const std::string& s
goto out; goto out;
} }
catch (SessionException const& e) { catch (SessionException const& e) {
gchar* escaped_error_txt = 0;
stringstream ss; stringstream ss;
dump_errors (ss, 6); dump_errors (ss, 6);
dump_errors (cerr); dump_errors (cerr);
clear_errors (); clear_errors ();
{
const std::string& tmp = ss.str();
escaped_error_txt = g_markup_escape_text (tmp.c_str(), -1);
}
ArdourMessageDialog msg (string_compose( ArdourMessageDialog msg (string_compose(
_("Session \"%1 (snapshot %2)\" did not load successfully:\n%3%4%5"), _("Session \"%1 (snapshot %2)\" did not load successfully:\n%3%4%5"),
path, snap_name, e.what(), ss.str().empty() ? "" : "\n\n---", ss.str()), path, snap_name, e.what(), ss.str().empty() ? "" : "\n\n---", escaped_error_txt),
false, false,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
BUTTONS_OK); BUTTONS_OK);
@ -432,18 +439,25 @@ ARDOUR_UI::load_session_stage_two (const std::string& path, const std::string& s
(void) msg.run (); (void) msg.run ();
msg.hide (); msg.hide ();
delete escaped_error_txt;
goto out; goto out;
} }
catch (...) { catch (...) {
gchar* escaped_error_txt = 0;
stringstream ss; stringstream ss;
dump_errors (ss, 6); dump_errors (ss, 6);
dump_errors (cerr); dump_errors (cerr);
clear_errors (); clear_errors ();
{
const std::string& tmp = ss.str();
escaped_error_txt = g_markup_escape_text (tmp.c_str(), -1);
}
ArdourMessageDialog msg (string_compose( ArdourMessageDialog msg (string_compose(
_("Session \"%1 (snapshot %2)\" did not load successfully.%3%4"), _("Session \"%1 (snapshot %2)\" did not load successfully.%3%4"),
path, snap_name, ss.str().empty() ? "" : "\n\n---", ss.str()), path, snap_name, ss.str().empty() ? "" : "\n\n---", escaped_error_txt),
true, true,
Gtk::MESSAGE_INFO, Gtk::MESSAGE_INFO,
BUTTONS_OK); BUTTONS_OK);
@ -453,6 +467,7 @@ ARDOUR_UI::load_session_stage_two (const std::string& path, const std::string& s
(void) msg.run (); (void) msg.run ();
msg.hide (); msg.hide ();
delete escaped_error_txt;
goto out; goto out;
} }
@ -632,29 +647,45 @@ ARDOUR_UI::build_session_stage_two (std::string const& path, std::string const&
new_session = new Session (*AudioEngine::instance(), path, snap_name, bus_profile.master_out_channels > 0 ? &bus_profile : NULL, meta_session ? "" : session_template, unnamed); new_session = new Session (*AudioEngine::instance(), path, snap_name, bus_profile.master_out_channels > 0 ? &bus_profile : NULL, meta_session ? "" : session_template, unnamed);
} }
catch (SessionException const& e) { catch (SessionException const& e) {
gchar* escaped_error_txt = 0;
stringstream ss; stringstream ss;
dump_errors (ss, 6); dump_errors (ss, 6);
cerr << "Here are the errors associated with this failed session:\n"; cerr << "Here are the errors associated with this failed session:\n";
dump_errors (cerr); dump_errors (cerr);
cerr << "---------\n"; cerr << "---------\n";
clear_errors (); clear_errors ();
ArdourMessageDialog msg (string_compose(_("Could not create session in \"%1\": %2%3%4"), path, e.what(), ss.str().empty() ? "" : "\n\n---", ss.str()));
{
const std::string& tmp = ss.str();
escaped_error_txt = g_markup_escape_text (tmp.c_str(), -1);
}
ArdourMessageDialog msg (string_compose(_("Could not create session in \"%1\": %2%3%4"), path, e.what(), ss.str().empty() ? "" : "\n\n---", escaped_error_txt));
msg.set_title (_("Loading Error")); msg.set_title (_("Loading Error"));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
msg.run (); msg.run ();
delete escaped_error_txt;
return -1; return -1;
} }
catch (...) { catch (...) {
gchar* escaped_error_txt = 0;
stringstream ss; stringstream ss;
dump_errors (ss, 6); dump_errors (ss, 6);
cerr << "Here are the errors associated with this failed session:\n"; cerr << "Here are the errors associated with this failed session:\n";
dump_errors (cerr); dump_errors (cerr);
cerr << "---------\n"; cerr << "---------\n";
clear_errors (); clear_errors ();
ArdourMessageDialog msg (string_compose(_("Could not create session in \"%1\"%2%3"), path, ss.str().empty() ? "" : "\n\n---", ss.str()));
{
const std::string& tmp = ss.str();
escaped_error_txt = g_markup_escape_text (tmp.c_str(), -1);
}
ArdourMessageDialog msg (string_compose(_("Could not create session in \"%1\"%2%3"), path, ss.str().empty() ? "" : "\n\n---", escaped_error_txt));
msg.set_title (_("Loading Error")); msg.set_title (_("Loading Error"));
msg.set_position (Gtk::WIN_POS_CENTER); msg.set_position (Gtk::WIN_POS_CENTER);
msg.run (); msg.run ();
delete escaped_error_txt;
return -1; return -1;
} }