Bugfix: adding/removing use_xft in the config had no effect unless you restarted...

[monky] / src / x11.c

diff --git a/src/x11.c b/src/x11.c
index fff366d..a1ce8c0 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -44,7 +44,7 @@
 
 #ifdef XFT
 #include <X11/Xft/Xft.h>
-int use_xft = 0;
+int use_xft;
 #endif
 
 #ifdef HAVE_XDBE
@@ -53,9 +53,9 @@ int use_xdbe;
 
 #ifdef USE_ARGB
 int use_argb_visual;
-int own_window_argb_value;
 int have_argb_visual;
 #endif /* USE_ARGB */
+int own_window_argb_value;
 
 /* some basic X11 stuff */
 Display *display = NULL;
@@ -336,7 +336,7 @@ void init_window(int own_window, int w, int h, int set_trans, int back_colour,
                        XClassHint classHint;
                        XWMHints wmHint;
                        Atom xa;
-                       
+
 #ifdef USE_ARGB
                        if (have_argb_visual) {
                                attrs.colormap = window.colourmap;
@@ -778,7 +778,7 @@ void get_x11_desktop_info(Display *current_display, Atom atom)
 void update_x11info(void)
 {
        struct information *current_info = &info;
-       if (!x_initialised == YES)
+       if (x_initialised != YES)
                return;
        current_info->x11.monitor.number = XScreenCount(display);
        current_info->x11.monitor.current = XDefaultScreen(display);