[LyX/master] Bring window to front only for single-instance mode

[Enrico Forestieri]

commit 697580006e06d9f28bfa151dc804181e243cca4e
Author: Enrico Forestieri <for...@lyx.org>
Date:   Tue Jul 5 01:01:02 2016 +0200

    Bring window to front only for single-instance mode
    
    A window manager could be configured such that to maintain a certain
    stack order for the windows. It would be annoying that opening a new
    file through menu brings up the window, so do this only if we are
    loading a file through the lyx-server.
---
 src/frontends/qt4/GuiApplication.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/frontends/qt4/GuiApplication.cpp 
b/src/frontends/qt4/GuiApplication.cpp
index 9d2f3c3..6586207 100644
--- a/src/frontends/qt4/GuiApplication.cpp
+++ b/src/frontends/qt4/GuiApplication.cpp
@@ -1680,7 +1680,7 @@ void GuiApplication::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
                        current_view_->openDocument(fname);
                        if (!current_view_->documentBufferView())
                                current_view_->close();
-                       else {
+                       else if (cmd.origin() == FuncRequest::LYXSERVER) {
                                current_view_->raise();
                                current_view_->activateWindow();
                                current_view_->showNormal();
@@ -1690,9 +1690,11 @@ void GuiApplication::dispatch(FuncRequest const & cmd, 
DispatchResult & dr)
                        // but let's make sure
                        LASSERT(current_view_, break);
                        current_view_->openDocument(fname);
-                       current_view_->raise();
-                       current_view_->activateWindow();
-                       current_view_->showNormal();
+                       if (cmd.origin() == FuncRequest::LYXSERVER) {
+                               current_view_->raise();
+                               current_view_->activateWindow();
+                               current_view_->showNormal();
+                       }
                }
                break;
        }