Merge commit 'refs/merge-requests/3' of git://gitorious.org/procps/procps into merge-requests/3

This commit is contained in:
Craig Small 2012-03-16 07:26:12 +11:00
commit 7267c3a22b

View File

@ -657,7 +657,7 @@ int main(int argc, char *argv[])
tabpending = 0; tabpending = 0;
} }
move(y, x); move(y, x);
if (!exit_early && option_chgexit) { if (!first_screen && !exit_early && option_chgexit) {
#ifdef WITH_WATCH8BIT #ifdef WITH_WATCH8BIT
cchar_t oldc; cchar_t oldc;
in_wch(&oldc); in_wch(&oldc);
@ -739,5 +739,7 @@ int main(int argc, char *argv[])
usleep(interval * 1000000); usleep(interval * 1000000);
} while (!exit_early); } while (!exit_early);
return EXIT_FAILURE; endwin();
return EXIT_SUCCESS;
} }