Browse Source

Merge branch 'bugfix_realquiet' into bugfix_realquiet_2

Conflicts:
	cgminer.c
nfactor-troky
Luke Dashjr 13 years ago
parent
commit
c739d0dc15
  1. 6
      cgminer.c

6
cgminer.c

@ -4418,6 +4418,9 @@ int main (int argc, char *argv[]) @@ -4418,6 +4418,9 @@ int main (int argc, char *argv[])
}
#ifdef HAVE_CURSES
if (opt_realquiet || devices_enabled == -1)
use_curses = false;
if (use_curses)
enable_curses();
#endif
@ -4526,9 +4529,6 @@ int main (int argc, char *argv[]) @@ -4526,9 +4529,6 @@ int main (int argc, char *argv[])
#ifdef HAVE_CURSES
check_winsizes();
if (opt_realquiet)
use_curses = false;
#endif
if (!total_pools) {

Loading…
Cancel
Save