Fix bug #11635

(cherry picked from commit 46f1f6f1cbf2ddb4de8c4d96e76e3a1bd74f2e07)

diff --git a/src/Server.cpp b/src/Server.cpp
index 566f8f334400b6594cf587f71f5de43016ff7326..17829da77ca1e1d3ba78e28b91d84e6d2058a10c 100644 (file)
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -1002,6 +1002,9 @@ struct Sleep : QThread
 
 bool LyXComm::loadFilesInOtherInstance()
 {
+       if (theFilesToLoad().size() == 0)
+               return true;
+
        int pipefd;
        int loaded_files = 0;
        FileName const pipe(inPipeName());

diff --git a/status.23x b/status.23x
index ebfac89035294c20909f4625d30e488345a6f98f..acd7e1233b794b9264daadd9b0c652abdbff6ba6 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -67,6 +67,8 @@ What's new
 
 - Fix problems with apostrophe in path on Windows (bug 9368).
 
+- Don't open a new instance just because no files are given (bug 11635).
+
 
 * USER INTERFACE