Merge with branch1.1

1 files changed, 6 insertions, 4 deletions

diff --git a/src/messagedialog.cpp b/src/messagedialog.cpp
index 4a1ef0d6..62696938 100644
--- a/src/messagedialog.cpp
+++ b/src/messagedialog.cpp
@@ -79,11 +79,13 @@ void MessageDialog::resizeEvent(QResizeEvent *event)
 }
 
 
-void MessageDialog::showMessage(const QString &text, QWidget *reference)
+void MessageDialog::showMessage(const QString &text, QWidget *reference, bool bringToFront)
 {
   if (reference != NULL) {
-    MessageDialog *dialog = new MessageDialog(text, reference);
-    dialog->show();
-    reference->activateWindow();
+    if (bringToFront || (qApp->activeWindow() != NULL)) {
+      MessageDialog *dialog = new MessageDialog(text, reference);
+      dialog->show();
+      reference->activateWindow();
+    }
   }
 }