fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix regression, option --no-color not fully disabled colored output.

Browse source
This commit is contained in:
XMRig 2017-06-19 10:58:28 +03:00
parent ed0972da85
commit 9bfa49b7d0
5 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Console.cpp
View file

@ -40,10 +40,10 @@
Console *Console::m_self = nullptr;
void Console::init()
void Console::init(bool colors, bool background)
{
if (!m_self) {
m_self = new Console();
m_self = new Console(colors, background);
}
}
@ -97,7 +97,7 @@ void Console::message(Console::Level level, const char* fmt, ...)
stime.tm_hour,
stime.tm_min,
stime.tm_sec,
color,
m_colors ? color : "",
fmt,
m_colors ? kCL_N : ""
);
@ -121,10 +121,7 @@ void Console::text(const char* fmt, ...)
const int len = 64 + strlen(fmt) + 2;
char *buf = static_cast<char *>(alloca(len));
sprintf(buf, "%s%s\n",
fmt,
m_colors ? kCL_N : ""
);
sprintf(buf, "%s%s\n", fmt, m_colors ? kCL_N : "");
uv_mutex_lock(&m_mutex);
@ -137,8 +134,9 @@ void Console::text(const char* fmt, ...)
}
Console::Console() :
m_colors(true)
Console::Console(bool colors, bool background) :
m_background(background),
m_colors(colors)
{
uv_mutex_init(&m_mutex);
}