mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-05-28 03:10:27 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #344 from selmf/fix_docroot_path

Browse Source 
Server: Don't overwrite template and docroot path
This commit is contained in:
Luis Ángel San Martín 2022-10-23 19:30:16 +02:00 committed by GitHub
commit a07ac4a956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
YACReaderLibrary/server/yacreader_http_server.cpp
View File

@ -53,7 +53,7 @@ void YACReaderHttpServer::start(quint16 port)
#else #else
templatePath = QFileInfo(QCoreApplication::applicationDirPath(), baseTemplatePath).absoluteFilePath(); templatePath = QFileInfo(QCoreApplication::applicationDirPath(), baseTemplatePath).absoluteFilePath();
#endif #endif
if (!templateSettings->contains("path"))
templateSettings->setValue("path", templatePath); templateSettings->setValue("path", templatePath);
Static::templateLoader = new TemplateCache(templateSettings, app); Static::templateLoader = new TemplateCache(templateSettings, app);
@ -84,6 +84,7 @@ void YACReaderHttpServer::start(quint16 port)
docroot = QFileInfo(QCoreApplication::applicationDirPath(), basedocroot).absoluteFilePath(); docroot = QFileInfo(QCoreApplication::applicationDirPath(), basedocroot).absoluteFilePath();
#endif #endif
if (!fileSettings->contains("path"))
fileSettings->setValue("path", docroot); fileSettings->setValue("path", docroot);
Static::staticFileController = new StaticFileController(fileSettings, app); Static::staticFileController = new StaticFileController(fileSettings, app);