1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-15 17:47:09 +00:00

Merge branch '1.8.0' into 1.8.1

Conflicts:
	configure.ac.in
This commit is contained in:
Pavel Labath 2010-03-03 11:59:15 +01:00
commit e639ad45ae

View File

@ -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);