Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-04 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 36

create merged document and open a view for it (document is still empty at this point)

Browse source 
(cherry picked from commit 1b663f01af)

Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/model/doc/documentmanager.cpp
This commit is contained in:
Marc Zinnschlag 2015-08-16 15:24:48 +02:00 • committed by cc9cii
parent 0b8e04d6a8
commit 3eef192e4d
16 changed files with 165 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/opencs/editor.cpp
View file

@ -26,7 +26,8 @@
CS::Editor::Editor (OgreInit::OgreInit& ogreInit)
: mUserSettings (mCfgMgr), mOverlaySystem (0), mDocumentManager (mCfgMgr),
mViewManager (mDocumentManager), mPid(""),
mLock(), mIpcServerName ("org.openmw.OpenCS"), mServer(NULL), mClientSocket(NULL)
mLock(), mMerge (mDocumentManager),
mIpcServerName ("org.openmw.OpenCS"), mServer(NULL), mClientSocket(NULL)
{
std::pair<Files::PathContainer, std::vector<std::string> > config = readConfig();