Merge remote-tracking branch 'refs/remotes/xmrig/master'

Conflicts:
	CHANGELOG.md
	README.md
	src/version.h
This commit is contained in:
BenDroid 2018-01-19 19:25:31 +01:00
commit 5f8ea98764
2 changed files with 13 additions and 2 deletions

View file

@ -190,8 +190,10 @@ void App::onConsoleCommand(char command)
case 'p':
case 'P':
LOG_INFO(m_options->colors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume");
Workers::setEnabled(false);
if (Workers::isEnabled()) {
LOG_INFO(m_options->colors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume");
Workers::setEnabled(false);
}
break;
case 'r':