From 7ceeb7e67a20f0077f085045724061c1235d1f3b Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Mon, 16 Jun 2014 18:06:39 +0200
Subject: [PATCH] waiting dialog: handle exceptions

---
 gui/qt/util.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gui/qt/util.py b/gui/qt/util.py
index e6c13a87..9139136f 100644
--- a/gui/qt/util.py
+++ b/gui/qt/util.py
@@ -21,11 +21,19 @@ class WaitingDialog(QThread):
         self.d.show()
 
     def run(self):
-        self.result = self.run_task()
+        self.error = None
+        try:
+            self.result = self.run_task()
+        except Exception as e:
+            self.error = str(e)
         self.d.emit(SIGNAL('done'))
 
     def close(self):
         self.d.accept()
+        if self.error:
+            QMessageBox.warning(self.parent, _('Error'), self.error, _('OK'))
+            return
+
         if self.on_complete:
             self.on_complete(*self.result)