M src/clock/clock.c → src/clock/clock.c

@@ -258,8 +258,6 @@ else new_width = date_width;
 	new_width += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);
 
 	Panel *panel = ((Area*)obj)->panel;
-	clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
-
 	if (new_width > clock->area.width || new_width < (clock->area.width-6)) {
 		// resize clock
 		// we try to limit the number of resize
@@ -274,6 +272,8 @@ #endif
 		systray.area.resize = 1;
 		panel_refresh = 1;
 	}
+	clock->area.posx = panel->area.width - clock->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
+
 
 	g_object_unref (layout);
 	cairo_destroy (c);

M src/config.c → src/config.c

@@ -527,12 +527,13 @@ if (status == TASK_NORMAL) panel_config.g_task.area.bg = panel_config.g_task.background[TASK_NORMAL];
 	}
 
 	/* Systray */
-	else if (strcmp (key, "systray") == 0) {
+	// systray disabled in snapshot mode
+	else if (strcmp (key, "systray") == 0 && snapshot_path == 0) {
 		systray_enabled = atoi(value);
 		// systray is latest option added. files without 'systray' are old.
 		old_config_file = 0;
 	}
-	else if (strcmp (key, "systray_padding") == 0) {
+	else if (strcmp (key, "systray_padding") == 0 && snapshot_path == 0) {
 		if (old_config_file)
 			systray_enabled = 1;
 		extract_values(value, &value1, &value2, &value3);