1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00

Merge branch 'fix_msvc' into 'master'

fix msvc build

See merge request OpenMW/openmw!2968
This commit is contained in:
psi29a 2023-04-25 11:12:26 +00:00
commit b89594b66f

View File

@ -45,7 +45,7 @@ CS::Editor::Editor(int argc, char** argv)
, mSettingsState(mCfgMgr) , mSettingsState(mCfgMgr)
, mDocumentManager(mCfgMgr) , mDocumentManager(mCfgMgr)
, mPid(std::filesystem::temp_directory_path() / "openmw-cs.pid") , mPid(std::filesystem::temp_directory_path() / "openmw-cs.pid")
, mLockFile(QFileInfo(mPid.c_str()).absoluteFilePath() + ".lock") , mLockFile(QFileInfo(Files::pathToQString(mPid)).absoluteFilePath() + ".lock")
, mMerge(mDocumentManager) , mMerge(mDocumentManager)
, mIpcServerName("org.openmw.OpenCS") , mIpcServerName("org.openmw.OpenCS")
, mServer(nullptr) , mServer(nullptr)