archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed conflicts

Browse source
This commit is contained in:
Nekotekina 2014-07-11 10:09:38 +04:00
commit 259b57c64a
53 changed files with 366 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Utilities/Log.cpp
View file

@ -1,4 +1,5 @@
#include "stdafx.h"
#include "rPlatform.h"
#include "Log.h"
#include <iostream>
#include <string>
@ -98,7 +99,7 @@ struct FileListener : LogListener
bool mPrependChannelName;
FileListener(const std::string& name = _PRGNAME_, bool prependChannel = true)
: mFile(name + ".log", rFile::write),
: mFile(std::string(rPlatform::getConfigDir() + name + ".log").c_str(), rFile::write),
mPrependChannelName(prependChannel)
{
if (!mFile.IsOpened())
@ -236,4 +237,4 @@ LogManager& LogManager::getInstance()
LogChannel &LogManager::getChannel(LogType type)
{
return mChannels[static_cast<u32>(type)];
}
}