about summary refs log tree commit diff stats
path: root/src/windows.c
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2013-01-22 01:33:32 +0000
committerJames Booth <boothj5@gmail.com>2013-01-22 01:33:32 +0000
commit5d7022750150eb0e12710a413e18697b64c2ffd1 (patch)
tree515ba1f958d08ed406f9f0e5ec9d4a6eb1cbba0b /src/windows.c
parent61095b3e414981a3e6848f2b5867e136776fd933 (diff)
parentc850ee69cc88cb962db182e91fe0226d051643c1 (diff)
downloadprofani-tty-5d7022750150eb0e12710a413e18697b64c2ffd1.tar.gz
Merge remote-tracking branch 'backalor/master'
Conflicts:
	src/command.c
	src/preferences.c
	src/preferences.h
	src/windows.c
Diffstat (limited to 'src/windows.c')
-rw-r--r--src/windows.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/windows.c b/src/windows.c
index e0811dad..c56ceb70 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -1296,6 +1296,11 @@ cons_show_ui_prefs(void)
         cons_show("Mouse handling (/mouse)      : ON");
     else
         cons_show("Mouse handling (/mouse)      : OFF");
+
+    if (prefs_get_statuses())
+        cons_show("Status (/statuses)           : ON");
+    else
+        cons_show("Status (/statuses)           : OFF");
 }
 
 void
@@ -2035,6 +2040,9 @@ _show_status_string(WINDOW *win, const char * const from,
     GDateTime *last_activity, const char * const pre,
     const char * const default_show)
 {
+    if (!prefs_get_statuses())
+        return;
+
     _win_show_time(win, '-');
 
     if (show != NULL) {