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

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
src/App.cpp
View file

@ -190,8 +190,10 @@ void App::onConsoleCommand(char command)
case 'p': case 'p':
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"); if (Workers::isEnabled()) {
Workers::setEnabled(false); 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; break;
case 'r': case 'r':

9
src/Options.cpp
View file

@ -36,6 +36,11 @@
#endif #endif
#ifndef XMRIG_NO_HTTPD
# include <microhttpd.h>
#endif
#include "Cpu.h" #include "Cpu.h"
#include "donate.h" #include "donate.h"
#include "net/Url.h" #include "net/Url.h"
@ -832,6 +837,10 @@ void Options::showVersion()
"\n"); "\n");
printf("\nlibuv/%s\n", uv_version_string()); printf("\nlibuv/%s\n", uv_version_string());
# ifndef XMRIG_NO_HTTPD
printf("libmicrohttpd/%s\n", MHD_get_version());
# endif
} }