aboutsummaryrefslogtreecommitdiffstats
path: root/desktop-widgets/mainwindow.h
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2017-10-31 21:28:59 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-10-31 16:32:08 -0700
commit3acc28cebf9d3ebaa48c564f87c0eb85ed43b74c (patch)
treef4cce6cb29b0a89b754293a44cae31f9f4fb8efe /desktop-widgets/mainwindow.h
parent945a0a87482dc24c5f12cdaaf1b3576549a4c8a5 (diff)
downloadsubsurface-3acc28cebf9d3ebaa48c564f87c0eb85ed43b74c.tar.gz
Postpone error message display if not in GUI thread
Calls to report_error() crashed if not called from GUI thread. Fix this by postponing error message display if not in GUI thread. Code that creates a thread which possibly calls report_error() is responsible for calling MainWindow::showErrors() to flush the accumulated messages. Note that there is a race condition in report_error() and get_error_string(). Nevertheless, hitting it should be rather unlikely (two threads producing error messages at the same time) and hopefully it can be fixed rather easily. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets/mainwindow.h')
-rw-r--r--desktop-widgets/mainwindow.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h
index edd3fb0c8..50590aa28 100644
--- a/desktop-widgets/mainwindow.h
+++ b/desktop-widgets/mainwindow.h
@@ -89,6 +89,10 @@ public:
void enableDisableCloudActions();
void setCheckedActionFilterTags(bool checked);
+ // Shows errors that have accumulated.
+ // Must be called from GUI thread.
+ void showErrors();
+
private
slots:
/* file menu action */