Discovery 5: leaky windshield, water break-in

Hi, perfect timing of my D5 to develop the “leaky windshield” problem. After all, just 2 weeks before warranty end, but on holiday and thus far away from dry garage or workshop. Someone here (with a D5) has had the problem before? Fix is probably cut out and glue the disc again? Greetings, Hauser