Fix #10328.

[lyx.git] / src / Server.cpp

diff --git a/src/Server.cpp b/src/Server.cpp
index d4a2120b6ea5e3c0550b5348a59766971259898a..dfc932c67466f0ec1c5a8a3c2f3062be6680d326 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -1003,8 +1003,24 @@ struct Sleep : QThread
 bool LyXComm::loadFilesInOtherInstance()
 {
        int pipefd;
-       int loaded_files = 0;
        FileName const pipe(inPipeName());
+
+       if (theFilesToLoad().empty()) {
+               LYXERR0("LyX is already running in another instance\n"
+                       "and 'use single instance' is active.");
+               // Wait a while for the other instance to reset the connection
+               Sleep::millisec(200);
+               pipefd = ::open(pipe.toFilesystemEncoding().c_str(), O_WRONLY);
+               if (pipefd >= 0) {
+                       string const cmd = "LYXCMD:pipe:window-raise\n";
+                       if (::write(pipefd, cmd.c_str(), cmd.length()) < 0)
+                               LYXERR0("Cannot communicate with running instance!");
+                       ::close(pipefd);
+               }
+               return true;
+       }
+
+       int loaded_files = 0;
        vector<string>::iterator it = theFilesToLoad().begin();
        while (it != theFilesToLoad().end()) {
                FileName fname = fileSearch(string(), os::internal_path(*it),