From ec33a95ad04099d428275de2c6b36e7098cc943e Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 14 Mar 2014 10:35:09 -0700 Subject: show the error string in the GUI rather than stderr This makes the error string just be an internal "membuffer", which the GUI can fetch and show when errors occur. The error string keeps accumulating until somebody retrieves it with "get_error_string()". This should make any write errors actually show up to the user. Signed-off-by: Linus Torvalds Signed-off-by: Dirk Hohndel --- qt-ui/mainwindow.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index 671f39cf7..44b02b125 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -899,8 +899,10 @@ int MainWindow::file_save_as(void) if (ui.InfoWidget->isEditing()) ui.InfoWidget->acceptChanges(); - if (save_dives(filename.toUtf8().data())) + if (save_dives(filename.toUtf8().data())) { + showError(get_error_string()); return -1; + } set_filename(filename.toUtf8().data(), true); setTitle(MWTF_FILENAME); @@ -927,8 +929,10 @@ int MainWindow::file_save(void) if (!current_def_dir.exists()) current_def_dir.mkpath(current_def_dir.absolutePath()); } - if (save_dives(existing_filename)) + if (save_dives(existing_filename)) { + showError(get_error_string()); return -1; + } mark_divelist_changed(false); addRecentFile(QStringList() << QString(existing_filename)); return 0; -- cgit v1.2.3-70-g09d2