From 224c35d568caa23ffc1844c7fb66ee74ca2f0f6c Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Mon, 3 Oct 2016 09:30:25 -0700 Subject: [PATCH] Clean up launch server in main.cpp --- interface/src/main.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 8dd4414c6b..c2bc10eefc 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -129,18 +129,20 @@ int main(int argc, const char* argv[]) { parser.addOption(serverContentPathOption); parser.parse(arguments); if (parser.isSet(runServerOption)) { - QString serverPath = QFileInfo(arguments[0]).path(); - serverPath += "/server-console/server-console.exe"; - //serverPath = "./server-console/server-console.exe"; + //QString serverPath = QFileInfo(arguments[0]).path(); + QString applicationDirPath = QCoreApplication::applicationDirPath(); + QString serverPath = "/server-console/server-console.exe"; + qDebug() << "Application dir path is: " << applicationDirPath; + qDebug() << "Server path is: " << serverPath; QStringList args; if (parser.isSet(serverContentPathOption)) { QString serverContentPath = QFileInfo(arguments[0]).path() + "/" + parser.value(serverContentPathOption); args << "--" << "--contentPath" << serverContentPath; } - qDebug() << "server path: " << serverPath << args; qDebug() << QFileInfo(arguments[0]).path(); qDebug() << QProcess::startDetached(serverPath, args); + // Sleep a short amount of time to give the server a chance to start usleep(2000000); }