From c1e832e08dc548a3aa846863bb861dc4cbe51562 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Tue, 12 May 2026 22:19:07 +0200
Subject: [PATCH 01/28] EPG-Grid: Tooltip mit TextWrapping und 30s ShowDuration

---
 MainWindow.xaml.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 74dc07d..bd1c454 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -993,11 +993,17 @@ public partial class MainWindow : Window
             BorderBrush = new System.Windows.Media.SolidColorBrush(borderColor),
             BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(3),
             Cursor = Cursors.Hand,
-            ToolTip = $"{ev.StartTime:HH:mm}–{ev.EndTime:HH:mm}\n{ev.Title}" +
-                     (string.IsNullOrWhiteSpace(ev.Description) ? "" : $"\n\n{ev.Description}"),
             Tag = ch, Child = content
         };
 
+        // Tooltip mit Zeilenumbruch und Beschreibung
+        var ttText = $"{ev.StartTime:HH:mm}\u2013{ev.EndTime:HH:mm}  {ev.Title}";
+        if (!string.IsNullOrWhiteSpace(ev.Description))
+            ttText += $"\n\n{ev.Description}";
+        var tt = new ToolTip { MaxWidth = 420, Content = new TextBlock { Text = ttText, TextWrapping = TextWrapping.Wrap, FontSize = 12 } };
+        ToolTipService.SetShowDuration(box, 30000);
+        box.ToolTip = tt;
+
         box.MouseEnter += (_, _) => box.Background = new System.Windows.Media.SolidColorBrush(
             isCurrent ? System.Windows.Media.Color.FromRgb(0xB8, 0x21, 0x3A)
                       : System.Windows.Media.Color.FromRgb(0x36, 0x36, 0x36));

From d2eeffd20059fe0dab2732f5cd4d444616b78c70 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Tue, 12 May 2026 22:30:34 +0200
Subject: [PATCH 02/28] EPG: WebView pausieren bei EPG-Overlay, zurueck zu
 WebView beim Schliessen

---
 MainWindow.xaml.cs | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index bd1c454..57d8967 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -761,12 +761,27 @@ public partial class MainWindow : Window
 
     private async void BtnEpgGrid_Click(object sender, RoutedEventArgs e)
     {
+        // WebView pausieren damit EPG-Overlay sichtbar ist
+        if (_currentChannel?.Kind == ChannelKind.Web && _webViewReady)
+        {
+            await WebView.CoreWebView2.ExecuteScriptAsync(
+                "document.querySelectorAll('video,audio').forEach(m => m.pause())");
+            WebView.Visibility = Visibility.Collapsed;
+            VideoView.Visibility = Visibility.Visible;
+        }
         await ShowEpgOverlayAsync();
     }
 
     private void BtnCloseEpg_Click(object sender, RoutedEventArgs e)
     {
         HideEpgOverlay();
+        // Wenn Web-Sender aktiv: WebView wieder anzeigen
+        if (_currentChannel?.Kind == ChannelKind.Web)
+        {
+            VideoView.Visibility = Visibility.Collapsed;
+            VideoOverlay.Visibility = Visibility.Collapsed;
+            WebView.Visibility = Visibility.Visible;
+        }
     }
 
     // ────────── EPG-Overlay (Joyn-Style) ──────────
@@ -1108,7 +1123,16 @@ public partial class MainWindow : Window
         {
             case Key.F11: ToggleFullscreen(); e.Handled = true; break;
             case Key.Escape:
-                if (EpgOverlay.Visibility == Visibility.Visible) HideEpgOverlay();
+                if (EpgOverlay.Visibility == Visibility.Visible)
+                {
+                    HideEpgOverlay();
+                    if (_currentChannel?.Kind == ChannelKind.Web)
+                    {
+                        VideoView.Visibility = Visibility.Collapsed;
+                        VideoOverlay.Visibility = Visibility.Collapsed;
+                        WebView.Visibility = Visibility.Visible;
+                    }
+                }
                 else if (_isFullscreen) ToggleFullscreen();
                 e.Handled = true;
                 break;

From 15e7182c22b0036ac309b4dfaa26303eb35abee4 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Tue, 12 May 2026 22:51:25 +0200
Subject: [PATCH 03/28] EPG-Overlay aus VideoView raus - funktioniert jetzt
 auch ueber WebView und TV

---
 MainWindow.xaml    | 143 +++++++++++++--------------------------------
 MainWindow.xaml.cs |  21 +------
 2 files changed, 43 insertions(+), 121 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 9769afd..13714b0 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -227,133 +227,74 @@
                 <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
-            <!-- VideoView + WebView2: beide im gleichen Grid-Cell, Visibility steuert wer sichtbar ist -->
+            <!-- VideoView + WebView2 + EPG-Overlay: alle im gleichen Grid-Cell -->
             <Grid Grid.Row="0">
+
                 <!-- VLC-Player fuer TV/Radio -->
                 <vlc:VideoView x:Name="VideoView" Background="Black">
                     <Border x:Name="VideoOverlay"
                             Background="#01000000"
                             PreviewMouseLeftButtonDown="VideoClickCatcher_DoubleClick">
                         <Grid>
-
                             <!-- Radio-Cover bei Audio-Streams — INNERHALB VideoView damit es die native HWND überdeckt -->
-                            <Border x:Name="RadioCover" Visibility="Collapsed"
-                                    Background="#1A1A1A">
+                            <Border x:Name="RadioCover" Visibility="Collapsed" Background="#1A1A1A">
                                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                                     <Image x:Name="RadioLogo" Width="200" Height="200" Stretch="Uniform"
                                            RenderOptions.BitmapScalingMode="HighQuality"/>
                                     <TextBlock x:Name="RadioFallbackIcon" Text="📻"
                                                FontSize="120" Foreground="#444"
-                                               HorizontalAlignment="Center"
-                                               Visibility="Collapsed"/>
+                                               HorizontalAlignment="Center" Visibility="Collapsed"/>
                                     <TextBlock x:Name="TxtRadioName"
                                                FontSize="24" FontWeight="Bold" Foreground="White"
                                                HorizontalAlignment="Center" Margin="0,24,0,0"/>
                                     <TextBlock x:Name="TxtRadioText"
                                                FontSize="16" Foreground="#0078D4" FontWeight="SemiBold"
                                                HorizontalAlignment="Center" Margin="24,12,24,0"
-                                               TextWrapping="Wrap" TextAlignment="Center"
-                                               MaxWidth="600"/>
+                                               TextWrapping="Wrap" TextAlignment="Center" MaxWidth="600"/>
                                 </StackPanel>
                             </Border>
-
-                            <!-- EPG-Overlay (Joyn-Style): liegt INNERHALB der VideoView damit Klicks ber HWND funktionieren -->
-                            <Border x:Name="EpgOverlay" Visibility="Collapsed"
-                                    Background="#D8000000">
-                                <DockPanel>
-                                    <!-- Header: Programm + Datum/Zeit + Schließen -->
-                                    <Grid DockPanel.Dock="Top" Background="#0A0A0A" Height="60">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto"/>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition Width="Auto"/>
-                                        </Grid.ColumnDefinitions>
-                                        <TextBlock Grid.Column="0" Text="Programm"
-                                                   Foreground="White" FontSize="24" FontWeight="Bold"
-                                                   VerticalAlignment="Center" Margin="24,0"/>
-                                        <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,16,0">
-                                            <TextBlock x:Name="TxtEpgDate" Foreground="#CCC" FontSize="14" VerticalAlignment="Center" Margin="0,0,16,0"/>
-                                            <TextBlock x:Name="TxtEpgTime" Foreground="White" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center" Margin="0,0,16,0"/>
-                                            <Button x:Name="BtnCloseEpg" Content="✕" FontSize="18"
-                                                    Width="40" Height="40"
-                                                    Background="Transparent" Foreground="White" BorderThickness="0"
-                                                    Cursor="Hand"
-                                                    Click="BtnCloseEpg_Click"
-                                                    ToolTip="Schließen (Esc)"/>
-                                        </StackPanel>
-                                    </Grid>
-
-                                    <!-- Status-Zeile (Lade EPG… etc.) -->
-                                    <TextBlock x:Name="TxtEpgOverlayStatus" DockPanel.Dock="Bottom"
-                                               Foreground="#888" FontSize="11" Padding="24,8"
-                                               Background="#0A0A0A"/>
-
-                                    <!-- Scrollbares EPG-Grid (Canvas) -->
-                                    <!-- ScrollBar-Style explizit hier weil vlc:VideoView eine eigene HWND hat
-                                         und Window.Resources-Styles dort nicht greifen -->
-                                    <ScrollViewer x:Name="EpgScrollViewer"
-                                                  HorizontalScrollBarVisibility="Auto"
-                                                  VerticalScrollBarVisibility="Auto"
-                                                  Background="#0A0A0A">
-                                        <ScrollViewer.Resources>
-                                            <Style TargetType="ScrollBar">
-                                                <Setter Property="Background" Value="#0E0E0E"/>
-                                                <Setter Property="BorderThickness" Value="0"/>
-                                                <Setter Property="Width" Value="10"/>
-                                                <Setter Property="Template">
-                                                    <Setter.Value>
-                                                        <ControlTemplate TargetType="ScrollBar">
-                                                            <Grid Background="{TemplateBinding Background}">
-                                                                <Track Name="PART_Track" IsDirectionReversed="true">
-                                                                    <Track.Thumb>
-                                                                        <Thumb>
-                                                                            <Thumb.Template>
-                                                                                <ControlTemplate TargetType="Thumb">
-                                                                                    <Border x:Name="thumbBd" Background="#3A3A3A" CornerRadius="3" Margin="2"/>
-                                                                                    <ControlTemplate.Triggers>
-                                                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                                                            <Setter TargetName="thumbBd" Property="Background" Value="#555"/>
-                                                                                        </Trigger>
-                                                                                    </ControlTemplate.Triggers>
-                                                                                </ControlTemplate>
-                                                                            </Thumb.Template>
-                                                                        </Thumb>
-                                                                    </Track.Thumb>
-                                                                    <Track.IncreaseRepeatButton>
-                                                                        <RepeatButton Background="Transparent" BorderThickness="0" Command="ScrollBar.PageDownCommand" IsTabStop="False"/>
-                                                                    </Track.IncreaseRepeatButton>
-                                                                    <Track.DecreaseRepeatButton>
-                                                                        <RepeatButton Background="Transparent" BorderThickness="0" Command="ScrollBar.PageUpCommand" IsTabStop="False"/>
-                                                                    </Track.DecreaseRepeatButton>
-                                                                </Track>
-                                                            </Grid>
-                                                        </ControlTemplate>
-                                                    </Setter.Value>
-                                                </Setter>
-                                                <Style.Triggers>
-                                                    <Trigger Property="Orientation" Value="Horizontal">
-                                                        <Setter Property="Width" Value="Auto"/>
-                                                        <Setter Property="Height" Value="10"/>
-                                                    </Trigger>
-                                                </Style.Triggers>
-                                            </Style>
-                                        </ScrollViewer.Resources>
-                                        <Canvas x:Name="EpgCanvas"/>
-                                    </ScrollViewer>
-                                </DockPanel>
-                            </Border>
                         </Grid>
                     </Border>
                 </vlc:VideoView>
 
-                <!-- WebView2 fuer Web-Sender (YouTube, Netflix, Mediatheken etc.) -->
-                <!-- Persistentes User-Data-Profil: Login bleibt erhalten -->
-                <!-- Liegt VOR dem VideoView im Z-Order, damit Klicks nicht vom VideoOverlay gefangen werden -->
-                <wv2:WebView2 x:Name="WebView"
-                              Visibility="Collapsed"
-                              Panel.ZIndex="5"/>
+                <!-- WebView2 fuer Web-Sender -->
+                <wv2:WebView2 x:Name="WebView" Visibility="Collapsed" Panel.ZIndex="5"/>
+
+                <!-- EPG-Overlay: AUSSERHALB VideoView und WebView damit es immer sichtbar ist -->
+                <!-- Panel.ZIndex="10" stellt sicher dass es ueber VLC-HWND und WebView-HWND liegt -->
+                <Border x:Name="EpgOverlay" Visibility="Collapsed"
+                        Background="#D8000000"
+                        Panel.ZIndex="10">
+                    <DockPanel>
+                        <Grid DockPanel.Dock="Top" Background="#0A0A0A" Height="60">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Column="0" Text="Programm"
+                                       Foreground="White" FontSize="24" FontWeight="Bold"
+                                       VerticalAlignment="Center" Margin="24,0"/>
+                            <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,16,0">
+                                <TextBlock x:Name="TxtEpgDate" Foreground="#CCC" FontSize="14" VerticalAlignment="Center" Margin="0,0,16,0"/>
+                                <TextBlock x:Name="TxtEpgTime" Foreground="White" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center" Margin="0,0,16,0"/>
+                                <Button x:Name="BtnCloseEpg" Content="✕" FontSize="18"
+                                        Width="40" Height="40"
+                                        Background="Transparent" Foreground="White" BorderThickness="0"
+                                        Cursor="Hand" Click="BtnCloseEpg_Click" ToolTip="Schließen (Esc)"/>
+                            </StackPanel>
+                        </Grid>
+                        <TextBlock x:Name="TxtEpgOverlayStatus" DockPanel.Dock="Bottom"
+                                   Foreground="#888" FontSize="11" Padding="24,8" Background="#0A0A0A"/>
+                        <ScrollViewer x:Name="EpgScrollViewer"
+                                      HorizontalScrollBarVisibility="Auto"
+                                      VerticalScrollBarVisibility="Auto"
+                                      Background="#0A0A0A">
+                            <Canvas x:Name="EpgCanvas"/>
+                        </ScrollViewer>
+                    </DockPanel>
+                </Border>
 
-                <!-- Kein Burger-Button mehr - Strg+B zum Einblenden der Seitenleiste -->
                 <TextBlock x:Name="TxtNoChannel"
                            Text="Wähle einen Sender aus der Liste"
                            Foreground="#666" FontSize="18"
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 57d8967..adbf3aa 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -761,27 +761,16 @@ public partial class MainWindow : Window
 
     private async void BtnEpgGrid_Click(object sender, RoutedEventArgs e)
     {
-        // WebView pausieren damit EPG-Overlay sichtbar ist
+        // WebView pausieren (EPG-Overlay liegt jetzt ausserhalb der HWNDs, kein Visibility-Wechsel noetig)
         if (_currentChannel?.Kind == ChannelKind.Web && _webViewReady)
-        {
             await WebView.CoreWebView2.ExecuteScriptAsync(
                 "document.querySelectorAll('video,audio').forEach(m => m.pause())");
-            WebView.Visibility = Visibility.Collapsed;
-            VideoView.Visibility = Visibility.Visible;
-        }
         await ShowEpgOverlayAsync();
     }
 
     private void BtnCloseEpg_Click(object sender, RoutedEventArgs e)
     {
         HideEpgOverlay();
-        // Wenn Web-Sender aktiv: WebView wieder anzeigen
-        if (_currentChannel?.Kind == ChannelKind.Web)
-        {
-            VideoView.Visibility = Visibility.Collapsed;
-            VideoOverlay.Visibility = Visibility.Collapsed;
-            WebView.Visibility = Visibility.Visible;
-        }
     }
 
     // ────────── EPG-Overlay (Joyn-Style) ──────────
@@ -1124,15 +1113,7 @@ public partial class MainWindow : Window
             case Key.F11: ToggleFullscreen(); e.Handled = true; break;
             case Key.Escape:
                 if (EpgOverlay.Visibility == Visibility.Visible)
-                {
                     HideEpgOverlay();
-                    if (_currentChannel?.Kind == ChannelKind.Web)
-                    {
-                        VideoView.Visibility = Visibility.Collapsed;
-                        VideoOverlay.Visibility = Visibility.Collapsed;
-                        WebView.Visibility = Visibility.Visible;
-                    }
-                }
                 else if (_isFullscreen) ToggleFullscreen();
                 e.Handled = true;
                 break;

From d22808497d9b486490fa899685cb7e4454d6831e Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Tue, 12 May 2026 23:44:30 +0200
Subject: [PATCH 04/28] publish.ps1: UTF-8 Encoding fuer API-Body

---
 publish.ps1 | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/publish.ps1 b/publish.ps1
index 4b3daec..b80b4b5 100644
--- a/publish.ps1
+++ b/publish.ps1
@@ -77,16 +77,17 @@ if (-not $Tag) {
 }
 
 Write-Host "→ Forgejo-Release $Tag erstellen..."
-$headers = @{ 'Authorization' = "token $Token"; 'Content-Type' = 'application/json' }
-$body = @{
+$headers = @{ 'Authorization' = "token $Token"; 'Content-Type' = 'application/json; charset=utf-8' }
+$bodyObj = @{
     tag_name = $Tag
     name = "HomeStream $version"
-    body = "Self-contained Release für Windows 10/11 (x64). Keine .NET-Installation nötig."
+    body = "Self-contained Release fuer Windows 10/11 (x64). Keine .NET-Installation noetig."
     draft = $false
     prerelease = $false
-} | ConvertTo-Json
-
-$release = Invoke-RestMethod -Uri "$ApiBase/releases" -Method Post -Headers $headers -Body $body
+}
+# Explizit UTF-8 kodieren damit Umlaute korrekt uebertragen werden
+$bodyBytes = [System.Text.Encoding]::UTF8.GetBytes(($bodyObj | ConvertTo-Json))
+$release = Invoke-RestMethod -Uri "$ApiBase/releases" -Method Post -Headers $headers -Body $bodyBytes
 Write-Host "  Release-ID: $($release.id)"
 
 # ── 5. ZIP als Asset hochladen ────────────────────────────────────────────

From d0f9df0a64f54fdf46548ba88f0ac7658915504e Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Wed, 13 May 2026 00:09:21 +0200
Subject: [PATCH 05/28] EPG-Overlay zurueck in VideoView (HWND-Fix), WebView
 wird beim EPG-Oeffnen versteckt

---
 MainWindow.xaml    | 115 +++++++++++++++++++++++++++++++--------------
 MainWindow.xaml.cs |  20 +++++++-
 2 files changed, 98 insertions(+), 37 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 13714b0..11eb2cf 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -236,7 +236,7 @@
                             Background="#01000000"
                             PreviewMouseLeftButtonDown="VideoClickCatcher_DoubleClick">
                         <Grid>
-                            <!-- Radio-Cover bei Audio-Streams — INNERHALB VideoView damit es die native HWND überdeckt -->
+                            <!-- Radio-Cover bei Audio-Streams -->
                             <Border x:Name="RadioCover" Visibility="Collapsed" Background="#1A1A1A">
                                 <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
                                     <Image x:Name="RadioLogo" Width="200" Height="200" Stretch="Uniform"
@@ -253,6 +253,84 @@
                                                TextWrapping="Wrap" TextAlignment="Center" MaxWidth="600"/>
                                 </StackPanel>
                             </Border>
+
+                            <!-- EPG-Overlay: INNERHALB VideoView (HWND-Grenze)
+                                 VideoView wird beim EPG-Oeffnen immer sichtbar gemacht,
+                                 auch wenn WebView aktiv war -->
+                            <Border x:Name="EpgOverlay" Visibility="Collapsed"
+                                    Background="#D8000000">
+                                <DockPanel>
+                                    <Grid DockPanel.Dock="Top" Background="#0A0A0A" Height="60">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <TextBlock Grid.Column="0" Text="Programm"
+                                                   Foreground="White" FontSize="24" FontWeight="Bold"
+                                                   VerticalAlignment="Center" Margin="24,0"/>
+                                        <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,16,0">
+                                            <TextBlock x:Name="TxtEpgDate" Foreground="#CCC" FontSize="14" VerticalAlignment="Center" Margin="0,0,16,0"/>
+                                            <TextBlock x:Name="TxtEpgTime" Foreground="White" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center" Margin="0,0,16,0"/>
+                                            <Button x:Name="BtnCloseEpg" Content="✕" FontSize="18"
+                                                    Width="40" Height="40"
+                                                    Background="Transparent" Foreground="White" BorderThickness="0"
+                                                    Cursor="Hand" Click="BtnCloseEpg_Click" ToolTip="Schließen (Esc)"/>
+                                        </StackPanel>
+                                    </Grid>
+                                    <TextBlock x:Name="TxtEpgOverlayStatus" DockPanel.Dock="Bottom"
+                                               Foreground="#888" FontSize="11" Padding="24,8" Background="#0A0A0A"/>
+                                    <ScrollViewer x:Name="EpgScrollViewer"
+                                                  HorizontalScrollBarVisibility="Auto"
+                                                  VerticalScrollBarVisibility="Auto"
+                                                  Background="#0A0A0A">
+                                        <ScrollViewer.Resources>
+                                            <Style TargetType="ScrollBar">
+                                                <Setter Property="Background" Value="#0E0E0E"/>
+                                                <Setter Property="BorderThickness" Value="0"/>
+                                                <Setter Property="Width" Value="10"/>
+                                                <Setter Property="Template">
+                                                    <Setter.Value>
+                                                        <ControlTemplate TargetType="ScrollBar">
+                                                            <Grid Background="{TemplateBinding Background}">
+                                                                <Track Name="PART_Track" IsDirectionReversed="true">
+                                                                    <Track.Thumb>
+                                                                        <Thumb>
+                                                                            <Thumb.Template>
+                                                                                <ControlTemplate TargetType="Thumb">
+                                                                                    <Border x:Name="thumbBd" Background="#3A3A3A" CornerRadius="3" Margin="2"/>
+                                                                                    <ControlTemplate.Triggers>
+                                                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                                                            <Setter TargetName="thumbBd" Property="Background" Value="#555"/>
+                                                                                        </Trigger>
+                                                                                    </ControlTemplate.Triggers>
+                                                                                </ControlTemplate>
+                                                                            </Thumb.Template>
+                                                                        </Thumb>
+                                                                    </Track.Thumb>
+                                                                    <Track.IncreaseRepeatButton>
+                                                                        <RepeatButton Background="Transparent" BorderThickness="0" Command="ScrollBar.PageDownCommand" IsTabStop="False"/>
+                                                                    </Track.IncreaseRepeatButton>
+                                                                    <Track.DecreaseRepeatButton>
+                                                                        <RepeatButton Background="Transparent" BorderThickness="0" Command="ScrollBar.PageUpCommand" IsTabStop="False"/>
+                                                                    </Track.DecreaseRepeatButton>
+                                                                </Track>
+                                                            </Grid>
+                                                        </ControlTemplate>
+                                                    </Setter.Value>
+                                                </Setter>
+                                                <Style.Triggers>
+                                                    <Trigger Property="Orientation" Value="Horizontal">
+                                                        <Setter Property="Width" Value="Auto"/>
+                                                        <Setter Property="Height" Value="10"/>
+                                                    </Trigger>
+                                                </Style.Triggers>
+                                            </Style>
+                                        </ScrollViewer.Resources>
+                                        <Canvas x:Name="EpgCanvas"/>
+                                    </ScrollViewer>
+                                </DockPanel>
+                            </Border>
                         </Grid>
                     </Border>
                 </vlc:VideoView>
@@ -260,41 +338,6 @@
                 <!-- WebView2 fuer Web-Sender -->
                 <wv2:WebView2 x:Name="WebView" Visibility="Collapsed" Panel.ZIndex="5"/>
 
-                <!-- EPG-Overlay: AUSSERHALB VideoView und WebView damit es immer sichtbar ist -->
-                <!-- Panel.ZIndex="10" stellt sicher dass es ueber VLC-HWND und WebView-HWND liegt -->
-                <Border x:Name="EpgOverlay" Visibility="Collapsed"
-                        Background="#D8000000"
-                        Panel.ZIndex="10">
-                    <DockPanel>
-                        <Grid DockPanel.Dock="Top" Background="#0A0A0A" Height="60">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0" Text="Programm"
-                                       Foreground="White" FontSize="24" FontWeight="Bold"
-                                       VerticalAlignment="Center" Margin="24,0"/>
-                            <StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center" Margin="0,0,16,0">
-                                <TextBlock x:Name="TxtEpgDate" Foreground="#CCC" FontSize="14" VerticalAlignment="Center" Margin="0,0,16,0"/>
-                                <TextBlock x:Name="TxtEpgTime" Foreground="White" FontSize="18" FontWeight="SemiBold" VerticalAlignment="Center" Margin="0,0,16,0"/>
-                                <Button x:Name="BtnCloseEpg" Content="✕" FontSize="18"
-                                        Width="40" Height="40"
-                                        Background="Transparent" Foreground="White" BorderThickness="0"
-                                        Cursor="Hand" Click="BtnCloseEpg_Click" ToolTip="Schließen (Esc)"/>
-                            </StackPanel>
-                        </Grid>
-                        <TextBlock x:Name="TxtEpgOverlayStatus" DockPanel.Dock="Bottom"
-                                   Foreground="#888" FontSize="11" Padding="24,8" Background="#0A0A0A"/>
-                        <ScrollViewer x:Name="EpgScrollViewer"
-                                      HorizontalScrollBarVisibility="Auto"
-                                      VerticalScrollBarVisibility="Auto"
-                                      Background="#0A0A0A">
-                            <Canvas x:Name="EpgCanvas"/>
-                        </ScrollViewer>
-                    </DockPanel>
-                </Border>
-
                 <TextBlock x:Name="TxtNoChannel"
                            Text="Wähle einen Sender aus der Liste"
                            Foreground="#666" FontSize="18"
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index adbf3aa..09fc02f 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -761,16 +761,26 @@ public partial class MainWindow : Window
 
     private async void BtnEpgGrid_Click(object sender, RoutedEventArgs e)
     {
-        // WebView pausieren (EPG-Overlay liegt jetzt ausserhalb der HWNDs, kein Visibility-Wechsel noetig)
+        // EPG-Overlay liegt innerhalb VideoView (HWND) - VideoView muss sichtbar sein
         if (_currentChannel?.Kind == ChannelKind.Web && _webViewReady)
             await WebView.CoreWebView2.ExecuteScriptAsync(
                 "document.querySelectorAll('video,audio').forEach(m => m.pause())");
+        WebView.Visibility = Visibility.Collapsed;
+        VideoView.Visibility = Visibility.Visible;
+        VideoOverlay.Visibility = Visibility.Visible;
         await ShowEpgOverlayAsync();
     }
 
     private void BtnCloseEpg_Click(object sender, RoutedEventArgs e)
     {
         HideEpgOverlay();
+        // Wenn Web-Sender: WebView wieder zeigen
+        if (_currentChannel?.Kind == ChannelKind.Web)
+        {
+            VideoView.Visibility = Visibility.Collapsed;
+            VideoOverlay.Visibility = Visibility.Collapsed;
+            WebView.Visibility = Visibility.Visible;
+        }
     }
 
     // ────────── EPG-Overlay (Joyn-Style) ──────────
@@ -1113,7 +1123,15 @@ public partial class MainWindow : Window
             case Key.F11: ToggleFullscreen(); e.Handled = true; break;
             case Key.Escape:
                 if (EpgOverlay.Visibility == Visibility.Visible)
+                {
                     HideEpgOverlay();
+                    if (_currentChannel?.Kind == ChannelKind.Web)
+                    {
+                        VideoView.Visibility = Visibility.Collapsed;
+                        VideoOverlay.Visibility = Visibility.Collapsed;
+                        WebView.Visibility = Visibility.Visible;
+                    }
+                }
                 else if (_isFullscreen) ToggleFullscreen();
                 e.Handled = true;
                 break;

From 5e211cc038e9b96af3c2ad13b2838dea59d76e7c Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Wed, 13 May 2026 00:31:45 +0200
Subject: [PATCH 06/28] VLC: 300ms Cache fuer RTSP/FritzBox, clock-jitter
 deaktiviert

---
 MainWindow.xaml.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 09fc02f..492e150 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -154,11 +154,15 @@ public partial class MainWindow : Window
         Core.Initialize(vlcDir);
 
         _libVLC = new LibVLC(
-            "--network-caching=1000",
+            "--network-caching=300",      // Genereller Netzwerk-Cache (ms)
+            "--rtsp-caching=300",          // RTSP-spezifischer Cache (FritzBox)
+            "--live-caching=300",          // Live-Stream-Cache
+            "--clock-jitter=0",            // Kein Jitter-Buffer
+            "--clock-synchro=0",           // Keine Synchronisation
             "--no-video-title-show",
             "--no-osd",
             "--no-snapshot-preview",
-            "--rtsp-tcp"
+            "--rtsp-tcp"                   // TCP statt UDP (verhindert Paketverluste)
         );
         _player = new MediaPlayer(_libVLC);
         _player.Volume = initialVolume;

From 58ffc7300bc528a026f905213202ce50bc60cf81 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Wed, 13 May 2026 00:34:46 +0200
Subject: [PATCH 07/28] Revert: EIT-Polling entfernt (Einfrieren), Cache
 zurueck auf 1000ms

---
 MainWindow.xaml.cs | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 492e150..4366b09 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -66,21 +66,12 @@ public partial class MainWindow : Window
         _epgTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(500) };
         _epgTimer.Tick += EpgTimer_Tick;
 
-        // Jede 10s: EIT-Daten aus Media neu lesen (libVLC feuert MetaChanged nicht bei laufendem EIT-Update)
         // Jede 60s: XMLTV Jetzt/Danach refreshen
-        _epgRefreshTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(10) };
-        var _epgRefreshTick = 0;
+        _epgRefreshTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(60) };
         _epgRefreshTimer.Tick += (_, _) =>
         {
-            if (_currentChannel == null) return;
-            if (_currentChannel.Source == ChannelSource.FritzBox && _currentMedia != null)
-                UpdateEpgFromMedia(_currentMedia);
-            _epgRefreshTick++;
-            if (_epgRefreshTick >= 6)
-            {
-                _epgRefreshTick = 0;
+            if (_currentChannel != null)
                 UpdateNextFromEpgService(_currentChannel);
-            }
         };
         _epgRefreshTimer.Start();
 
@@ -154,15 +145,11 @@ public partial class MainWindow : Window
         Core.Initialize(vlcDir);
 
         _libVLC = new LibVLC(
-            "--network-caching=300",      // Genereller Netzwerk-Cache (ms)
-            "--rtsp-caching=300",          // RTSP-spezifischer Cache (FritzBox)
-            "--live-caching=300",          // Live-Stream-Cache
-            "--clock-jitter=0",            // Kein Jitter-Buffer
-            "--clock-synchro=0",           // Keine Synchronisation
+            "--network-caching=1000",
             "--no-video-title-show",
             "--no-osd",
             "--no-snapshot-preview",
-            "--rtsp-tcp"                   // TCP statt UDP (verhindert Paketverluste)
+            "--rtsp-tcp"
         );
         _player = new MediaPlayer(_libVLC);
         _player.Volume = initialVolume;

From 27b5b6805f044a588aa2dcbc8d1b375af958a75b Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Wed, 13 May 2026 00:43:11 +0200
Subject: [PATCH 08/28] MetaChanged throttle 2s - verhindert UI-Flooding durch
 DVB-Metadaten

---
 MainWindow.xaml.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 4366b09..e466ca5 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -531,8 +531,14 @@ public partial class MainWindow : Window
         RadioFallbackIcon.Visibility = Visibility.Visible;
     }
 
+    private DateTime _lastMetaUpdate = DateTime.MinValue;
+
     private void OnMediaMetaChanged(object? sender, MediaMetaChangedEventArgs args)
     {
+        // Throttle: maximal alle 2s verarbeiten damit der UI-Thread nicht geflutet wird
+        var now = DateTime.Now;
+        if ((now - _lastMetaUpdate).TotalSeconds < 2) return;
+        _lastMetaUpdate = now;
         if (sender is Media m) Dispatcher.BeginInvoke(() => UpdateEpgFromMedia(m));
     }
 
@@ -1084,7 +1090,6 @@ public partial class MainWindow : Window
     {
         if (msg == WM_KEYDOWN && (int)wParam == VK_B)
         {
-            // GetKeyState(VK_CONTROL) - High-bit gesetzt = Taste gedrueckt
             var ctrl = (NativeMethods.GetKeyState(0x11) & 0x8000) != 0;
             if (ctrl)
                 Dispatcher.BeginInvoke(() => BtnSidebarToggle_Click(this, new RoutedEventArgs()));

From 6249c6d149f18e36ed8cc4ab5aab7b57be767b98 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Wed, 13 May 2026 01:21:54 +0200
Subject: [PATCH 09/28] EPG wieder eingebaut - Problem war FritzBox-Reboot
 noetig, nicht EPG-Code

---
 MainWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index e466ca5..464412d 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -387,7 +387,7 @@ public partial class MainWindow : Window
             _player.Media = media;
             _player.Play();
 
-            TxtEpgNow.Text = "EPG wird geladen…";
+            TxtEpgNow.Text = "EPG wird geladen\u2026";
             TxtEpgNext.Text = "";
 
             _epgTimer.Stop();

From 6e10f0b979a3c047890002180bd5fe8255773298 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Wed, 13 May 2026 11:36:39 +0200
Subject: [PATCH 10/28] EPG: EIT alle 60s auf Background-Thread - kein UI-Block

---
 MainWindow.xaml.cs | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 464412d..888736b 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -66,12 +66,28 @@ public partial class MainWindow : Window
         _epgTimer = new DispatcherTimer { Interval = TimeSpan.FromMilliseconds(500) };
         _epgTimer.Tick += EpgTimer_Tick;
 
-        // Jede 60s: XMLTV Jetzt/Danach refreshen
+        // Jede 60s: XMLTV Jetzt/Danach refreshen + EIT neu lesen
         _epgRefreshTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(60) };
         _epgRefreshTimer.Tick += (_, _) =>
         {
-            if (_currentChannel != null)
-                UpdateNextFromEpgService(_currentChannel);
+            if (_currentChannel == null) return;
+            // EIT auf Background-Thread lesen damit UI nicht blockiert
+            if (_currentChannel.Source == ChannelSource.FritzBox && _currentMedia != null)
+            {
+                var media = _currentMedia;
+                Task.Run(() =>
+                {
+                    try
+                    {
+                        var nowPlaying = media.Meta(MetadataType.NowPlaying) ?? "";
+                        var showName = media.Meta(MetadataType.ShowName) ?? "";
+                        if (!string.IsNullOrWhiteSpace(nowPlaying) || !string.IsNullOrWhiteSpace(showName))
+                            Dispatcher.BeginInvoke(() => UpdateEpgFromMedia(media));
+                    }
+                    catch { }
+                });
+            }
+            UpdateNextFromEpgService(_currentChannel);
         };
         _epgRefreshTimer.Start();
 

From 5e8014c127095440bdb3c2a719c930ca3be22166 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Wed, 13 May 2026 12:39:49 +0200
Subject: [PATCH 11/28] Favoriten medienuebergreifend, Startkategorie Favoriten

---
 MainWindow.xaml.cs      | 3 ++-
 Services/AppSettings.cs | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 888736b..9696a75 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -23,7 +23,7 @@ public partial class MainWindow : Window
 
     private readonly ObservableCollection<Channel> _allChannels = new();
     private readonly ObservableCollection<Channel> _filteredChannels = new();
-    private string _currentCategory = "all";
+    private string _currentCategory = "fav";  // wird in MainWindow_Loaded aus Settings gesetzt
     private string _searchTerm = "";
     private Channel? _currentChannel;
     private double _volumeBeforeMute = 80;
@@ -56,6 +56,7 @@ public partial class MainWindow : Window
         InitializeComponent();
         LstChannels.ItemsSource = _filteredChannels;
         TxtFritzBox.Text = $"FritzBox: {_settings.FritzBoxIp}";
+        _currentCategory = _settings.StartCategory;
         SldVolume.Value = _settings.Volume;
 
         DarkTitleBar.EnableFor(this);
diff --git a/Services/AppSettings.cs b/Services/AppSettings.cs
index c9ae0b8..87fd4c8 100644
--- a/Services/AppSettings.cs
+++ b/Services/AppSettings.cs
@@ -13,6 +13,9 @@ public class AppSettings
     /// <summary>Online-Sender (ÖR-TV + Webradio aus Assets\online-sources.json) zusätzlich zur FritzBox-Liste anzeigen</summary>
     public bool ShowOnlineSources { get; set; } = true;
 
+    /// <summary>Startkategorie beim App-Start (default: Favoriten)</summary>
+    public string StartCategory { get; set; } = "fav";
+
     private static readonly string ConfigPath = AppPaths.Settings;
 
     public static AppSettings Load()

From faa852016d3732466684f21968e62a52c9e50637 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sat, 16 May 2026 16:27:39 +0200
Subject: [PATCH 12/28] Favoriten: Web-Sender nicht durch MergeHdSd filtern

---
 MainWindow.xaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 9696a75..6d8f250 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -319,7 +319,7 @@ public partial class MainWindow : Window
             "radio-fritz"  => q.Where(c => c.Kind == ChannelKind.Radio && c.Source == ChannelSource.FritzBox),
             "radio-online" => q.Where(c => c.Kind == ChannelKind.Radio && c.Source == ChannelSource.Online),
             "web"          => q.Where(c => c.Kind == ChannelKind.Web),
-            "fav"          => MergeHdSd(q.Where(c => c.IsFavorite)),
+            "fav"          => q.Where(c => c.IsFavorite),  // kein MergeHdSd - Web-Sender wuerden sonst rausgefiltert
             _              => MergeHdSd(q.Where(c => c.Kind != ChannelKind.Web))  // "all" ohne Web
         };
 

From 5bf1f06bfed8fb82839194faaa5b070040bba51a Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 16:55:16 +0200
Subject: [PATCH 13/28] EPG-Erinnerungen: Rechtsklick auf Sendung,
 Glocke-Indikator, MessageBox-Benachrichtigung

---
 MainWindow.xaml.cs          | 59 ++++++++++++++++++++++
 Models/Reminder.cs          | 16 ++++++
 Services/AppPaths.cs        |  1 +
 Services/ReminderService.cs | 99 +++++++++++++++++++++++++++++++++++++
 4 files changed, 175 insertions(+)
 create mode 100644 Models/Reminder.cs
 create mode 100644 Services/ReminderService.cs

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 6d8f250..d611335 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -19,6 +19,7 @@ public partial class MainWindow : Window
     private Media? _currentMedia;
     private AppSettings _settings = AppSettings.Load();
     private readonly EpgService _epgService = new();
+    private readonly ReminderService _reminderService = new();
     private readonly LogoService _logoService = new();
 
     private readonly ObservableCollection<Channel> _allChannels = new();
@@ -1050,6 +1051,64 @@ public partial class MainWindow : Window
                 PlayChannel(target);
         };
 
+        // Rechtsklick: Kontextmenu mit Erinnern-Option
+        box.MouseRightButtonDown += (_, args) =>
+        {
+            args.Handled = true;
+            var hasReminder = _reminderService.HasReminder(ch.Name, ev.StartTime);
+            var menu = new ContextMenu();
+
+            var remind = new MenuItem
+            {
+                Header = hasReminder ? "\u23f0 Erinnerung entfernen" : "\u23f0 5 min vorher erinnern",
+                FontSize = 13
+            };
+            remind.Click += (_, _) =>
+            {
+                if (hasReminder)
+                {
+                    var existing = _reminderService.Reminders
+                        .FirstOrDefault(r => r.ChannelName == ch.Name && r.StartTime == ev.StartTime);
+                    if (existing != null) _reminderService.Remove(existing.Id);
+                }
+                else
+                {
+                    _reminderService.Add(new Reminder
+                    {
+                        ChannelName = ch.Name,
+                        Title = ev.Title,
+                        Description = ev.Description ?? "",
+                        StartTime = ev.StartTime,
+                        EndTime = ev.EndTime,
+                        MinutesBefore = 5
+                    });
+                }
+                // Grid neu bauen damit Indikator aktualisiert wird
+                _ = BuildEpgGridAsync();
+            };
+            menu.Items.Add(remind);
+            box.ContextMenu = menu;
+            menu.IsOpen = true;
+        };
+
+        // Erinnerungs-Indikator anzeigen wenn Erinnerung gesetzt
+        if (_reminderService.HasReminder(ch.Name, ev.StartTime))
+        {
+            var bell = new TextBlock
+            {
+                Text = "\u23f0",
+                FontSize = 11,
+                HorizontalAlignment = HorizontalAlignment.Right,
+                VerticalAlignment = VerticalAlignment.Top,
+                Margin = new Thickness(0, 3, 4, 0),
+                IsHitTestVisible = false
+            };
+            var overlay = new Grid();
+            overlay.Children.Add(content);
+            overlay.Children.Add(bell);
+            box.Child = overlay;
+        }
+
         return box;
     }
 
diff --git a/Models/Reminder.cs b/Models/Reminder.cs
new file mode 100644
index 0000000..f465581
--- /dev/null
+++ b/Models/Reminder.cs
@@ -0,0 +1,16 @@
+namespace FritzTV.Models;
+
+public class Reminder
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public required string ChannelName { get; set; }
+    public required string Title { get; set; }
+    public string Description { get; set; } = "";
+    public DateTime StartTime { get; set; }
+    public DateTime EndTime { get; set; }
+    public int MinutesBefore { get; set; } = 5;
+    public bool Fired { get; set; } = false;
+
+    /// <summary>Zeitpunkt zu dem die Benachrichtigung ausgelöst wird</summary>
+    public DateTime NotifyAt => StartTime.AddMinutes(-MinutesBefore);
+}
diff --git a/Services/AppPaths.cs b/Services/AppPaths.cs
index 6e55dc1..bdb7dce 100644
--- a/Services/AppPaths.cs
+++ b/Services/AppPaths.cs
@@ -36,4 +36,5 @@ public static class AppPaths
     public static string Epg => Path.Combine(Root, "epg");
     public static string CrashLog => Path.Combine(Root, "crash.log");
     public static string WebView2Profile => Path.Combine(Root, "webview2");
+    public static string Reminders => Path.Combine(Root, "reminders.json");
 }
diff --git a/Services/ReminderService.cs b/Services/ReminderService.cs
new file mode 100644
index 0000000..05c6f0a
--- /dev/null
+++ b/Services/ReminderService.cs
@@ -0,0 +1,99 @@
+using System.IO;
+using System.Text.Json;
+using System.Windows.Threading;
+using FritzTV.Models;
+
+namespace FritzTV.Services;
+
+public class ReminderService
+{
+    private static readonly string RemindersPath = AppPaths.Reminders;
+    private readonly DispatcherTimer _checkTimer;
+    private List<Reminder> _reminders = new();
+
+    /// <summary>Feuert wenn eine Erinnerung faellig ist. Callback laeuft auf UI-Thread.</summary>
+    public event Action<Reminder>? ReminderDue;
+
+    public IReadOnlyList<Reminder> Reminders => _reminders.AsReadOnly();
+
+    public ReminderService()
+    {
+        Load();
+        _checkTimer = new DispatcherTimer { Interval = TimeSpan.FromSeconds(30) };
+        _checkTimer.Tick += (_, _) => CheckReminders();
+        _checkTimer.Start();
+    }
+
+    public void Add(Reminder reminder)
+    {
+        _reminders.Add(reminder);
+        Save();
+    }
+
+    public void Remove(Guid id)
+    {
+        _reminders.RemoveAll(r => r.Id == id);
+        Save();
+    }
+
+    public bool HasReminder(string channelName, DateTime startTime)
+        => _reminders.Any(r => r.ChannelName == channelName && r.StartTime == startTime);
+
+    private void CheckReminders()
+    {
+        var now = DateTime.Now;
+        var due = _reminders
+            .Where(r => !r.Fired && r.NotifyAt <= now && r.StartTime > now.AddMinutes(-30))
+            .ToList();
+
+        foreach (var r in due)
+        {
+            r.Fired = true;
+            FireNotification(r);
+            ReminderDue?.Invoke(r);
+        }
+
+        _reminders.RemoveAll(r => r.Fired && r.StartTime < now.AddHours(-1));
+        if (due.Any()) Save();
+    }
+
+    private static void FireNotification(Reminder r)
+    {
+        try
+        {
+            var minLeft = (int)(r.StartTime - DateTime.Now).TotalMinutes;
+            var when = minLeft <= 0 ? "Jetzt" : $"In {minLeft} Minute{(minLeft == 1 ? "" : "n")}";
+            var msg = $"{when}: {r.Title}\n{r.ChannelName}  {r.StartTime:HH:mm}\u2013{r.EndTime:HH:mm}";
+
+            System.Windows.MessageBox.Show(msg, "\u23f0 HomeStream-Erinnerung",
+                System.Windows.MessageBoxButton.OK,
+                System.Windows.MessageBoxImage.Information);
+        }
+        catch { }
+    }
+
+    private void Load()
+    {
+        try
+        {
+            if (File.Exists(RemindersPath))
+            {
+                var json = File.ReadAllText(RemindersPath);
+                _reminders = JsonSerializer.Deserialize<List<Reminder>>(json) ?? new();
+                _reminders.RemoveAll(r => r.StartTime < DateTime.Now.AddHours(-1));
+            }
+        }
+        catch { _reminders = new(); }
+    }
+
+    private void Save()
+    {
+        try
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(RemindersPath)!);
+            var json = JsonSerializer.Serialize(_reminders, new JsonSerializerOptions { WriteIndented = true });
+            File.WriteAllText(RemindersPath, json);
+        }
+        catch { }
+    }
+}

From b3d1e2e851765338e7944ffa2863aed190363e06 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 17:24:12 +0200
Subject: [PATCH 14/28] =?UTF-8?q?EPG-Erinnerung:=20Rebuild=20via=20BeginIn?=
 =?UTF-8?q?voke=20verz=C3=B6gert,=20Canvas-Clear=20Race-Condition=20behobe?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 MainWindow.xaml.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index d611335..7392db2 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -839,6 +839,9 @@ public partial class MainWindow : Window
 
     private async Task BuildEpgGridAsync()
     {
+        // Erst nach Background-Priority clearen damit laufende Event-Handler fertig sind
+        await Dispatcher.InvokeAsync(() => EpgCanvas.Children.Clear(),
+            System.Windows.Threading.DispatcherPriority.Background);
         EpgCanvas.Children.Clear();
 
         var channels = _allChannels
@@ -1083,8 +1086,9 @@ public partial class MainWindow : Window
                         MinutesBefore = 5
                     });
                 }
-                // Grid neu bauen damit Indikator aktualisiert wird
-                _ = BuildEpgGridAsync();
+                // Verzoegert neu bauen damit Event-Handler sauber abgeschlossen ist
+                Dispatcher.BeginInvoke(async () => await BuildEpgGridAsync(),
+                    System.Windows.Threading.DispatcherPriority.Background);
             };
             menu.Items.Add(remind);
             box.ContextMenu = menu;

From 4db5dd6f231b99c9cfbb04ee5dd118be06eeedfe Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 17:26:20 +0200
Subject: [PATCH 15/28] EPG-Erinnerung: logical child Fehler behoben

---
 MainWindow.xaml.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 7392db2..2c52228 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -1025,8 +1025,9 @@ public partial class MainWindow : Window
             BorderBrush = new System.Windows.Media.SolidColorBrush(borderColor),
             BorderThickness = new Thickness(1), CornerRadius = new CornerRadius(3),
             Cursor = Cursors.Hand,
-            Tag = ch, Child = content
+            Tag = ch
         };
+        box.Child = content;
 
         // Tooltip mit Zeilenumbruch und Beschreibung
         var ttText = $"{ev.StartTime:HH:mm}\u2013{ev.EndTime:HH:mm}  {ev.Title}";
@@ -1095,9 +1096,11 @@ public partial class MainWindow : Window
             menu.IsOpen = true;
         };
 
-        // Erinnerungs-Indikator anzeigen wenn Erinnerung gesetzt
+        // Erinnerungs-Indikator: bell-Icon oben rechts
         if (_reminderService.HasReminder(ch.Name, ev.StartTime))
         {
+            // box.Child auf null damit content aus dem logical tree raus ist
+            box.Child = null;
             var bell = new TextBlock
             {
                 Text = "\u23f0",

From d033411dfcbe16700a6c3c62e12e39dc67fad9da Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 17:39:37 +0200
Subject: [PATCH 16/28] EPG-Erinnerung: Jetzt einschalten Button wechselt
 automatisch den Sender

---
 MainWindow.xaml.cs          | 15 +++++++++++++++
 Services/ReminderService.cs | 14 +++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 2c52228..eeb0984 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -131,6 +131,21 @@ public partial class MainWindow : Window
         _ = InitializeWebViewAsync();
 
         await LoadChannelsAsync();
+        // Erinnerungs-Callback: Sender automatisch einschalten
+        _reminderService.SwitchToChannel = channelName =>
+        {
+            var ch = _allChannels.FirstOrDefault(c =>
+                c.Name.Equals(channelName, StringComparison.OrdinalIgnoreCase));
+            if (ch != null)
+            {
+                var listEntry = _filteredChannels.FirstOrDefault(c =>
+                    c.Name.Equals(channelName, StringComparison.OrdinalIgnoreCase));
+                if (listEntry != null)
+                    LstChannels.SelectedItem = listEntry;
+                else
+                    PlayChannel(ch);
+            }
+        };
         RestoreLastChannel();
         _ = LoadEpgInBackgroundAsync();
     }
diff --git a/Services/ReminderService.cs b/Services/ReminderService.cs
index 05c6f0a..d21a571 100644
--- a/Services/ReminderService.cs
+++ b/Services/ReminderService.cs
@@ -57,7 +57,7 @@ public class ReminderService
         if (due.Any()) Save();
     }
 
-    private static void FireNotification(Reminder r)
+    private void FireNotification(Reminder r)
     {
         try
         {
@@ -65,13 +65,21 @@ public class ReminderService
             var when = minLeft <= 0 ? "Jetzt" : $"In {minLeft} Minute{(minLeft == 1 ? "" : "n")}";
             var msg = $"{when}: {r.Title}\n{r.ChannelName}  {r.StartTime:HH:mm}\u2013{r.EndTime:HH:mm}";
 
-            System.Windows.MessageBox.Show(msg, "\u23f0 HomeStream-Erinnerung",
-                System.Windows.MessageBoxButton.OK,
+            var result = System.Windows.MessageBox.Show(
+                msg + "\n\nJetzt einschalten?",
+                "\u23f0 HomeStream-Erinnerung",
+                System.Windows.MessageBoxButton.YesNo,
                 System.Windows.MessageBoxImage.Information);
+
+            if (result == System.Windows.MessageBoxResult.Yes)
+                SwitchToChannel?.Invoke(r.ChannelName);
         }
         catch { }
     }
 
+    /// <summary>Wird aufgerufen wenn User bei Erinnerung "Jetzt einschalten" klickt.</summary>
+    public Action<string>? SwitchToChannel { get; set; }
+
     private void Load()
     {
         try

From 951e02f0fb5d42ff53e9d1350eff9b1ac5e7dcc8 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 17:44:23 +0200
Subject: [PATCH 17/28] EPG: nach Senderwechsel durch Erinnerung automatisch
 schliessen

---
 MainWindow.xaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index eeb0984..3a3d2e1 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -138,6 +138,7 @@ public partial class MainWindow : Window
                 c.Name.Equals(channelName, StringComparison.OrdinalIgnoreCase));
             if (ch != null)
             {
+                HideEpgOverlay();
                 var listEntry = _filteredChannels.FirstOrDefault(c =>
                     c.Name.Equals(channelName, StringComparison.OrdinalIgnoreCase));
                 if (listEntry != null)

From dbd7aad30d93d73dee437e310d9ae28ebfd84cc7 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 17:53:16 +0200
Subject: [PATCH 18/28] EPG: Scroll-Position nach Erinnerung-Rebuild
 beibehalten

---
 MainWindow.xaml.cs | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 3a3d2e1..55aa5fe 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -823,6 +823,8 @@ public partial class MainWindow : Window
     private const int EpgTotalHours = 8;
 
     private DateTime _epgStartTime;
+    private double _epgScrollH = 0;
+    private double _epgScrollV = 0;
 
     private async Task ShowEpgOverlayAsync()
     {
@@ -844,7 +846,7 @@ public partial class MainWindow : Window
         }
 
         TxtEpgOverlayStatus.Text = "Baue Programm\u2026";
-        await BuildEpgGridAsync();
+        await BuildEpgGridAsync(resetScroll: true);
     }
 
     private void HideEpgOverlay()
@@ -853,9 +855,11 @@ public partial class MainWindow : Window
         EpgCanvas.Children.Clear();
     }
 
-    private async Task BuildEpgGridAsync()
+
+    private async Task BuildEpgGridAsync(bool resetScroll = false)
     {
-        // Erst nach Background-Priority clearen damit laufende Event-Handler fertig sind
+        _epgScrollH = EpgScrollViewer.HorizontalOffset;
+        _epgScrollV = EpgScrollViewer.VerticalOffset;
         await Dispatcher.InvokeAsync(() => EpgCanvas.Children.Clear(),
             System.Windows.Threading.DispatcherPriority.Background);
         EpgCanvas.Children.Clear();
@@ -887,8 +891,16 @@ public partial class MainWindow : Window
         }
 
         TxtEpgOverlayStatus.Text = $"{channels.Count} Sender \u00b7 {EpgTotalHours} Stunden";
-        EpgScrollViewer.ScrollToHorizontalOffset(0);
-        EpgScrollViewer.ScrollToVerticalOffset(0);
+        if (resetScroll)
+        {
+            EpgScrollViewer.ScrollToHorizontalOffset(0);
+            EpgScrollViewer.ScrollToVerticalOffset(0);
+        }
+        else
+        {
+            EpgScrollViewer.ScrollToHorizontalOffset(_epgScrollH);
+            EpgScrollViewer.ScrollToVerticalOffset(_epgScrollV);
+        }
     }
 
     private void BuildEpgHeader(double totalMinutes, double contentWidth, double contentHeight)
@@ -1104,7 +1116,7 @@ public partial class MainWindow : Window
                     });
                 }
                 // Verzoegert neu bauen damit Event-Handler sauber abgeschlossen ist
-                Dispatcher.BeginInvoke(async () => await BuildEpgGridAsync(),
+                Dispatcher.BeginInvoke(async () => await BuildEpgGridAsync(resetScroll: false),
                     System.Windows.Threading.DispatcherPriority.Background);
             };
             menu.Items.Add(remind);

From 4880b25e905b3ede6d702fce2daeb0b192f4a9a7 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 22:57:30 +0200
Subject: [PATCH 19/28] ZDF Mediathek URL korrigiert

---
 Assets/online-sources.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/online-sources.json b/Assets/online-sources.json
index 3f497be..af63201 100644
--- a/Assets/online-sources.json
+++ b/Assets/online-sources.json
@@ -47,7 +47,7 @@
   "web": [
     { "name": "YouTube",            "url": "https://www.youtube.com" },
     { "name": "ARD Mediathek",      "url": "https://www.ardmediathek.de" },
-    { "name": "ZDF Mediathek",      "url": "https://www.zdf.de/serien-und-filme" },
+    { "name": "ZDF Mediathek",      "url": "https://www.zdf.de/" },
     { "name": "Netflix",            "url": "https://www.netflix.com" },
     { "name": "Disney+",            "url": "https://www.disneyplus.com" },
     { "name": "Joyn",               "url": "https://www.joyn.de" },

From b9b5d1c923627c61f738a03ba482810f4a3385f8 Mon Sep 17 00:00:00 2001
From: administrator <info@dimedtec.de>
Date: Sun, 17 May 2026 23:01:27 +0200
Subject: [PATCH 20/28] WebView: CoreWebView2.Navigate erzwingt Navigation zur
 definierten URL

---
 MainWindow.xaml.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 55aa5fe..6acf5b1 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -455,7 +455,7 @@ public partial class MainWindow : Window
 
         if (_webViewReady)
         {
-            WebView.Source = new Uri(ch.Url);
+            if (_webViewReady) WebView.CoreWebView2.Navigate(ch.Url); else WebView.Source = new Uri(ch.Url);
         }
         else
         {
@@ -465,7 +465,7 @@ public partial class MainWindow : Window
             {
                 retryTimer.Stop();
                 if (_webViewReady && _currentChannel?.Kind == ChannelKind.Web)
-                    WebView.Source = new Uri(ch.Url);
+                    if (_webViewReady) WebView.CoreWebView2.Navigate(ch.Url); else WebView.Source = new Uri(ch.Url);
             };
             retryTimer.Start();
         }

From b0e9e1022f05da11461a016c814019faa6cff188 Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Thu, 21 May 2026 22:47:51 +0200
Subject: [PATCH 21/28] Aufnahme: Start/Stop Button, libVLC sout in
 Videos\HomeStream, REC-Badge

---
 MainWindow.xaml         |  3 ++
 MainWindow.xaml.cs      | 88 +++++++++++++++++++++++++++++++++++++++++
 Services/AppSettings.cs |  4 ++
 3 files changed, 95 insertions(+)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 11eb2cf..c38a19c 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -381,6 +381,9 @@
                             <Slider x:Name="SldVolume" Width="100" Minimum="0" Maximum="100" Value="80"
                                     VerticalAlignment="Center" Margin="8,0"
                                     ValueChanged="SldVolume_ValueChanged"/>
+                            <Button x:Name="BtnRecord" Content="⏺" FontSize="16" Width="40" Height="40"
+                                    Background="Transparent" Foreground="#888" BorderThickness="0"
+                                    Click="BtnRecord_Click" Cursor="Hand" ToolTip="Aufnahme starten"/>
                             <Button x:Name="BtnFullscreen" Content="⛶" FontSize="16" Width="40" Height="40"
                                     Background="Transparent" Foreground="White" BorderThickness="0"
                                     Click="BtnFullscreen_Click" Cursor="Hand" ToolTip="Vollbild (F11)"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 6acf5b1..bb851d4 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -42,6 +42,11 @@ public partial class MainWindow : Window
     // WebView2 für Web-Sender (YouTube, Netflix etc.)
     private bool _webViewReady = false;
 
+    // Aufnahme
+    private MediaPlayer? _recordPlayer;
+    private Media? _recordMedia;
+    private bool _isRecording = false;
+
     // WndProc-Hook für globale Tastatureingaben (auch wenn WebView2 Fokus hat)
     private System.Windows.Interop.HwndSource? _hwndSource;
 
@@ -206,6 +211,7 @@ public partial class MainWindow : Window
         try
         {
             _hwndSource?.RemoveHook(WndProc);
+            if (_isRecording) StopRecording();
             _epgTimer.Stop();
             _zapTimer.Stop();
             _epgRefreshTimer.Stop();
@@ -392,6 +398,8 @@ public partial class MainWindow : Window
         TxtChannelSource.Foreground = ch.Source == ChannelSource.Online
             ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0x00, 0x78, 0xD4))
             : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0x66, 0xBB, 0x6A));
+        // Aufnahme stoppen wenn Sender wechselt
+        if (_isRecording) StopRecording();
         TxtNoChannel.Visibility = Visibility.Collapsed;
         UpdateFavButton();
 
@@ -687,6 +695,86 @@ public partial class MainWindow : Window
 
     private void BtnFullscreen_Click(object sender, RoutedEventArgs e) => ToggleFullscreen();
 
+    private void BtnRecord_Click(object sender, RoutedEventArgs e)
+    {
+        if (_isRecording) StopRecording();
+        else StartRecording();
+    }
+
+    private void StartRecording()
+    {
+        if (_currentChannel == null || _currentChannel.Kind == ChannelKind.Web)
+        {
+            MessageBox.Show("Aufnahme nur für TV- und Radio-Sender möglich.",
+                "HomeStream", MessageBoxButton.OK, MessageBoxImage.Information);
+            return;
+        }
+
+        try
+        {
+            // Zieldatei: Sendername + Zeitstempel.ts
+            var dir = _settings.RecordingPath;
+            Directory.CreateDirectory(dir);
+            var safeName = string.Join("_", _currentChannel.Name.Split(Path.GetInvalidFileNameChars()));
+            var fileName = $"{safeName}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.ts";
+            var filePath = Path.Combine(dir, fileName);
+
+            // Separater MediaPlayer nur für Aufnahme (kein Video-Output)
+            // Stream wird direkt von der Quelle aufgenommen, nicht vom laufenden Player
+            _recordMedia = new Media(_libVLC!, new Uri(_currentChannel.Url),
+                $":sout=#file{{dst={filePath}}}",
+                ":sout-keep",
+                ":network-caching=300");
+
+            _recordPlayer = new MediaPlayer(_libVLC!);
+            _recordPlayer.Media = _recordMedia;
+            _recordPlayer.Play();
+
+            _isRecording = true;
+            BtnRecord.Foreground = new System.Windows.Media.SolidColorBrush(
+                System.Windows.Media.Colors.Red);
+            BtnRecord.ToolTip = $"Aufnahme läuft: {fileName} — Klicken zum Stoppen";
+            TxtChannelSource.Text = (_currentChannel.Source == ChannelSource.Online ? "● Online" : "● FritzBox")
+                + "  🔴 REC";
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show($"Aufnahme-Fehler:\n{ex.Message}",
+                "HomeStream", MessageBoxButton.OK, MessageBoxImage.Error);
+        }
+    }
+
+    private void StopRecording()
+    {
+        try
+        {
+            _recordPlayer?.Stop();
+            _recordPlayer?.Dispose();
+            _recordMedia?.Dispose();
+        }
+        catch { }
+        finally
+        {
+            _recordPlayer = null;
+            _recordMedia = null;
+            _isRecording = false;
+            BtnRecord.Foreground = new System.Windows.Media.SolidColorBrush(
+                System.Windows.Media.Color.FromRgb(0x88, 0x88, 0x88));
+            BtnRecord.ToolTip = "Aufnahme starten";
+            // Source-Badge wiederherstellen
+            if (_currentChannel != null)
+            {
+                TxtChannelSource.Text = _currentChannel.Source == ChannelSource.Online
+                    ? "● Online" : "● FritzBox";
+                TxtChannelSource.Foreground = _currentChannel.Source == ChannelSource.Online
+                    ? new System.Windows.Media.SolidColorBrush(
+                        System.Windows.Media.Color.FromRgb(0x00, 0x78, 0xD4))
+                    : new System.Windows.Media.SolidColorBrush(
+                        System.Windows.Media.Color.FromRgb(0x66, 0xBB, 0x6A));
+            }
+        }
+    }
+
     private void ToggleFullscreen()
     {
         if (!_isFullscreen)
diff --git a/Services/AppSettings.cs b/Services/AppSettings.cs
index 87fd4c8..19e5a59 100644
--- a/Services/AppSettings.cs
+++ b/Services/AppSettings.cs
@@ -16,6 +16,10 @@ public class AppSettings
     /// <summary>Startkategorie beim App-Start (default: Favoriten)</summary>
     public string StartCategory { get; set; } = "fav";
 
+    /// <summary>Ordner fuer Aufnahmen (default: Videos\HomeStream)</summary>
+    public string RecordingPath { get; set; } = System.IO.Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), "HomeStream");
+
     private static readonly string ConfigPath = AppPaths.Settings;
 
     public static AppSettings Load()

From 75526a7d437e37783da709642d2571f845fd5299 Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Thu, 21 May 2026 23:01:21 +0200
Subject: [PATCH 22/28] Aufnahme: sout-duplicate - Livebild laeuft weiter
 waehrend Aufnahme

---
 MainWindow.xaml.cs | 59 ++++++++++++++++++++++++++++++----------------
 1 file changed, 39 insertions(+), 20 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index bb851d4..56f58be 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -43,8 +43,7 @@ public partial class MainWindow : Window
     private bool _webViewReady = false;
 
     // Aufnahme
-    private MediaPlayer? _recordPlayer;
-    private Media? _recordMedia;
+    private string? _recordingFilePath;
     private bool _isRecording = false;
 
     // WndProc-Hook für globale Tastatureingaben (auch wenn WebView2 Fokus hat)
@@ -709,33 +708,45 @@ public partial class MainWindow : Window
                 "HomeStream", MessageBoxButton.OK, MessageBoxImage.Information);
             return;
         }
+        if (_player == null || _currentMedia == null) return;
 
         try
         {
-            // Zieldatei: Sendername + Zeitstempel.ts
             var dir = _settings.RecordingPath;
             Directory.CreateDirectory(dir);
             var safeName = string.Join("_", _currentChannel.Name.Split(Path.GetInvalidFileNameChars()));
             var fileName = $"{safeName}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.ts";
             var filePath = Path.Combine(dir, fileName);
 
-            // Separater MediaPlayer nur für Aufnahme (kein Video-Output)
-            // Stream wird direkt von der Quelle aufgenommen, nicht vom laufenden Player
-            _recordMedia = new Media(_libVLC!, new Uri(_currentChannel.Url),
-                $":sout=#file{{dst={filePath}}}",
-                ":sout-keep",
-                ":network-caching=300");
+            // Laufenden Player stoppen, neue Media mit sout-duplicate starten
+            // #duplicate: gleichzeitig Display (Abspielen) UND File (Aufnahme)
+            _player.Stop();
 
-            _recordPlayer = new MediaPlayer(_libVLC!);
-            _recordPlayer.Media = _recordMedia;
-            _recordPlayer.Play();
+            var sout = $":sout=#duplicate{{dst=display,dst=file{{dst={filePath}}}}}";
+            var media = new Media(_libVLC!, new Uri(_currentChannel.Url),
+                sout,
+                ":sout-keep",
+                "--network-caching=1000",
+                "--no-video-title-show",
+                "--no-osd",
+                "--rtsp-tcp");
+
+            media.MetaChanged += OnMediaMetaChanged;
+
+            var oldMedia = _currentMedia;
+            _currentMedia = media;
+            _player.Media = media;
+            _player.Play();
+
+            try { oldMedia?.Dispose(); } catch { }
 
             _isRecording = true;
+            _recordingFilePath = filePath;
             BtnRecord.Foreground = new System.Windows.Media.SolidColorBrush(
                 System.Windows.Media.Colors.Red);
             BtnRecord.ToolTip = $"Aufnahme läuft: {fileName} — Klicken zum Stoppen";
-            TxtChannelSource.Text = (_currentChannel.Source == ChannelSource.Online ? "● Online" : "● FritzBox")
-                + "  🔴 REC";
+            TxtChannelSource.Text = (_currentChannel.Source == ChannelSource.Online
+                ? "● Online" : "● FritzBox") + "  🔴 REC";
         }
         catch (Exception ex)
         {
@@ -746,22 +757,30 @@ public partial class MainWindow : Window
 
     private void StopRecording()
     {
+        if (!_isRecording) return;
         try
         {
-            _recordPlayer?.Stop();
-            _recordPlayer?.Dispose();
-            _recordMedia?.Dispose();
+            // Player mit normalem Stream neu starten (ohne sout)
+            if (_currentChannel != null && _player != null && _libVLC != null)
+            {
+                _player.Stop();
+                var media = new Media(_libVLC, new Uri(_currentChannel.Url));
+                media.MetaChanged += OnMediaMetaChanged;
+                var oldMedia = _currentMedia;
+                _currentMedia = media;
+                _player.Media = media;
+                _player.Play();
+                try { oldMedia?.Dispose(); } catch { }
+            }
         }
         catch { }
         finally
         {
-            _recordPlayer = null;
-            _recordMedia = null;
             _isRecording = false;
+            _recordingFilePath = null;
             BtnRecord.Foreground = new System.Windows.Media.SolidColorBrush(
                 System.Windows.Media.Color.FromRgb(0x88, 0x88, 0x88));
             BtnRecord.ToolTip = "Aufnahme starten";
-            // Source-Badge wiederherstellen
             if (_currentChannel != null)
             {
                 TxtChannelSource.Text = _currentChannel.Source == ChannelSource.Online

From 2ac99425afd39f470d51e0765f47734d70a88b44 Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Thu, 21 May 2026 23:20:36 +0200
Subject: [PATCH 23/28] Aufnahme: --no-sout-audio verhindert Hall-Effekt beim
 Liveton

---
 MainWindow.xaml.cs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 56f58be..9b9abc9 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -722,10 +722,14 @@ public partial class MainWindow : Window
             // #duplicate: gleichzeitig Display (Abspielen) UND File (Aufnahme)
             _player.Stop();
 
-            var sout = $":sout=#duplicate{{dst=display,dst=file{{dst={filePath}}}}}";
+            // sout-duplicate: display (Liveanzeige) + file (Aufnahme)
+            // --no-sout-audio: sout gibt Audio NICHT nochmals aus (verhindert Hall durch doppelten Output)
+            // Audio kommt nur vom normalen Decoder-Pfad
+            var sout = $":sout=#duplicate{{dst=display,dst=std{{access=file,mux=ts,dst={filePath}}}}}";
             var media = new Media(_libVLC!, new Uri(_currentChannel.Url),
                 sout,
                 ":sout-keep",
+                "--no-sout-audio",
                 "--network-caching=1000",
                 "--no-video-title-show",
                 "--no-osd",

From 282e5c3f5a7bb9b8f08887255c33afbe9a62a6a6 Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Thu, 21 May 2026 23:34:08 +0200
Subject: [PATCH 24/28] Aufnahme: select=noaudio fuer display-dst

---
 MainWindow.xaml.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 9b9abc9..e84863a 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -722,14 +722,12 @@ public partial class MainWindow : Window
             // #duplicate: gleichzeitig Display (Abspielen) UND File (Aufnahme)
             _player.Stop();
 
-            // sout-duplicate: display (Liveanzeige) + file (Aufnahme)
-            // --no-sout-audio: sout gibt Audio NICHT nochmals aus (verhindert Hall durch doppelten Output)
-            // Audio kommt nur vom normalen Decoder-Pfad
-            var sout = $":sout=#duplicate{{dst=display,dst=std{{access=file,mux=ts,dst={filePath}}}}}";
+            // sout-duplicate: display nur Video (kein Audio via sout-Pfad!), file bekommt alles
+            // Audio laeuft separat ueber den normalen Decoder-Pfad -> kein Hall
+            var sout = $":sout=#duplicate{{dst=display{{select=noaudio}},dst=std{{access=file,mux=ts,dst={filePath}}}}}";
             var media = new Media(_libVLC!, new Uri(_currentChannel.Url),
                 sout,
                 ":sout-keep",
-                "--no-sout-audio",
                 "--network-caching=1000",
                 "--no-video-title-show",
                 "--no-osd",

From 84203db798cecf9ed7f4b14a5d6bc6a0c642e1a4 Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Thu, 21 May 2026 23:37:44 +0200
Subject: [PATCH 25/28] Aufnahme-Feature entfernt - libVLC sout-duplicate
 Hall-Problem nicht loesbar

---
 MainWindow.xaml         |   3 --
 MainWindow.xaml.cs      | 109 +---------------------------------------
 Services/AppSettings.cs |   4 --
 3 files changed, 1 insertion(+), 115 deletions(-)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index c38a19c..11eb2cf 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -381,9 +381,6 @@
                             <Slider x:Name="SldVolume" Width="100" Minimum="0" Maximum="100" Value="80"
                                     VerticalAlignment="Center" Margin="8,0"
                                     ValueChanged="SldVolume_ValueChanged"/>
-                            <Button x:Name="BtnRecord" Content="⏺" FontSize="16" Width="40" Height="40"
-                                    Background="Transparent" Foreground="#888" BorderThickness="0"
-                                    Click="BtnRecord_Click" Cursor="Hand" ToolTip="Aufnahme starten"/>
                             <Button x:Name="BtnFullscreen" Content="⛶" FontSize="16" Width="40" Height="40"
                                     Background="Transparent" Foreground="White" BorderThickness="0"
                                     Click="BtnFullscreen_Click" Cursor="Hand" ToolTip="Vollbild (F11)"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index e84863a..9dc63c9 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -42,10 +42,6 @@ public partial class MainWindow : Window
     // WebView2 für Web-Sender (YouTube, Netflix etc.)
     private bool _webViewReady = false;
 
-    // Aufnahme
-    private string? _recordingFilePath;
-    private bool _isRecording = false;
-
     // WndProc-Hook für globale Tastatureingaben (auch wenn WebView2 Fokus hat)
     private System.Windows.Interop.HwndSource? _hwndSource;
 
@@ -210,7 +206,6 @@ public partial class MainWindow : Window
         try
         {
             _hwndSource?.RemoveHook(WndProc);
-            if (_isRecording) StopRecording();
             _epgTimer.Stop();
             _zapTimer.Stop();
             _epgRefreshTimer.Stop();
@@ -398,7 +393,7 @@ public partial class MainWindow : Window
             ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0x00, 0x78, 0xD4))
             : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0x66, 0xBB, 0x6A));
         // Aufnahme stoppen wenn Sender wechselt
-        if (_isRecording) StopRecording();
+        // if (_isRecording) StopRecording();
         TxtNoChannel.Visibility = Visibility.Collapsed;
         UpdateFavButton();
 
@@ -694,108 +689,6 @@ public partial class MainWindow : Window
 
     private void BtnFullscreen_Click(object sender, RoutedEventArgs e) => ToggleFullscreen();
 
-    private void BtnRecord_Click(object sender, RoutedEventArgs e)
-    {
-        if (_isRecording) StopRecording();
-        else StartRecording();
-    }
-
-    private void StartRecording()
-    {
-        if (_currentChannel == null || _currentChannel.Kind == ChannelKind.Web)
-        {
-            MessageBox.Show("Aufnahme nur für TV- und Radio-Sender möglich.",
-                "HomeStream", MessageBoxButton.OK, MessageBoxImage.Information);
-            return;
-        }
-        if (_player == null || _currentMedia == null) return;
-
-        try
-        {
-            var dir = _settings.RecordingPath;
-            Directory.CreateDirectory(dir);
-            var safeName = string.Join("_", _currentChannel.Name.Split(Path.GetInvalidFileNameChars()));
-            var fileName = $"{safeName}_{DateTime.Now:yyyy-MM-dd_HH-mm-ss}.ts";
-            var filePath = Path.Combine(dir, fileName);
-
-            // Laufenden Player stoppen, neue Media mit sout-duplicate starten
-            // #duplicate: gleichzeitig Display (Abspielen) UND File (Aufnahme)
-            _player.Stop();
-
-            // sout-duplicate: display nur Video (kein Audio via sout-Pfad!), file bekommt alles
-            // Audio laeuft separat ueber den normalen Decoder-Pfad -> kein Hall
-            var sout = $":sout=#duplicate{{dst=display{{select=noaudio}},dst=std{{access=file,mux=ts,dst={filePath}}}}}";
-            var media = new Media(_libVLC!, new Uri(_currentChannel.Url),
-                sout,
-                ":sout-keep",
-                "--network-caching=1000",
-                "--no-video-title-show",
-                "--no-osd",
-                "--rtsp-tcp");
-
-            media.MetaChanged += OnMediaMetaChanged;
-
-            var oldMedia = _currentMedia;
-            _currentMedia = media;
-            _player.Media = media;
-            _player.Play();
-
-            try { oldMedia?.Dispose(); } catch { }
-
-            _isRecording = true;
-            _recordingFilePath = filePath;
-            BtnRecord.Foreground = new System.Windows.Media.SolidColorBrush(
-                System.Windows.Media.Colors.Red);
-            BtnRecord.ToolTip = $"Aufnahme läuft: {fileName} — Klicken zum Stoppen";
-            TxtChannelSource.Text = (_currentChannel.Source == ChannelSource.Online
-                ? "● Online" : "● FritzBox") + "  🔴 REC";
-        }
-        catch (Exception ex)
-        {
-            MessageBox.Show($"Aufnahme-Fehler:\n{ex.Message}",
-                "HomeStream", MessageBoxButton.OK, MessageBoxImage.Error);
-        }
-    }
-
-    private void StopRecording()
-    {
-        if (!_isRecording) return;
-        try
-        {
-            // Player mit normalem Stream neu starten (ohne sout)
-            if (_currentChannel != null && _player != null && _libVLC != null)
-            {
-                _player.Stop();
-                var media = new Media(_libVLC, new Uri(_currentChannel.Url));
-                media.MetaChanged += OnMediaMetaChanged;
-                var oldMedia = _currentMedia;
-                _currentMedia = media;
-                _player.Media = media;
-                _player.Play();
-                try { oldMedia?.Dispose(); } catch { }
-            }
-        }
-        catch { }
-        finally
-        {
-            _isRecording = false;
-            _recordingFilePath = null;
-            BtnRecord.Foreground = new System.Windows.Media.SolidColorBrush(
-                System.Windows.Media.Color.FromRgb(0x88, 0x88, 0x88));
-            BtnRecord.ToolTip = "Aufnahme starten";
-            if (_currentChannel != null)
-            {
-                TxtChannelSource.Text = _currentChannel.Source == ChannelSource.Online
-                    ? "● Online" : "● FritzBox";
-                TxtChannelSource.Foreground = _currentChannel.Source == ChannelSource.Online
-                    ? new System.Windows.Media.SolidColorBrush(
-                        System.Windows.Media.Color.FromRgb(0x00, 0x78, 0xD4))
-                    : new System.Windows.Media.SolidColorBrush(
-                        System.Windows.Media.Color.FromRgb(0x66, 0xBB, 0x6A));
-            }
-        }
-    }
-
     private void ToggleFullscreen()
     {
         if (!_isFullscreen)
diff --git a/Services/AppSettings.cs b/Services/AppSettings.cs
index 19e5a59..87fd4c8 100644
--- a/Services/AppSettings.cs
+++ b/Services/AppSettings.cs
@@ -16,10 +16,6 @@ public class AppSettings
     /// <summary>Startkategorie beim App-Start (default: Favoriten)</summary>
     public string StartCategory { get; set; } = "fav";
 
-    /// <summary>Ordner fuer Aufnahmen (default: Videos\HomeStream)</summary>
-    public string RecordingPath { get; set; } = System.IO.Path.Combine(
-        Environment.GetFolderPath(Environment.SpecialFolder.MyVideos), "HomeStream");
-
     private static readonly string ConfigPath = AppPaths.Settings;
 
     public static AppSettings Load()

From 732ce0ce78b506abc406a1c16016ebe181ed7136 Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Wed, 3 Jun 2026 19:45:25 +0200
Subject: [PATCH 26/28] Streaming: n-tv hinzugefuegt

---
 Assets/online-sources.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Assets/online-sources.json b/Assets/online-sources.json
index af63201..316a0aa 100644
--- a/Assets/online-sources.json
+++ b/Assets/online-sources.json
@@ -54,6 +54,7 @@
     { "name": "RTL+",               "url": "https://plus.rtl.de" },
     { "name": "ARTE",               "url": "https://www.arte.tv/de" },
     { "name": "Apple TV+",          "url": "https://tv.apple.com" },
-    { "name": "Amazon Prime Video", "url": "https://www.amazon.de/gp/video/storefront" }
+    { "name": "Amazon Prime Video", "url": "https://www.amazon.de/gp/video/storefront" },
+    { "name": "n-tv",               "url": "https://www.n-tv.de" }
   ]
 }

From 0da4161fa9b059ef06adf6139c74151e3a96b3ef Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Thu, 4 Jun 2026 11:01:02 +0200
Subject: [PATCH 27/28] Mute: WebView2 Audio per JS muten/unmuten

---
 MainWindow.xaml.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 9dc63c9..dd3792e 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -680,10 +680,14 @@ public partial class MainWindow : Window
         {
             _volumeBeforeMute = SldVolume.Value;
             SldVolume.Value = 0;
+            if (_webViewReady && WebView.Visibility == Visibility.Visible)
+                WebView.CoreWebView2.ExecuteScriptAsync("document.querySelectorAll('video,audio').forEach(m => m.muted=true)");
         }
         else
         {
             SldVolume.Value = _volumeBeforeMute > 0 ? _volumeBeforeMute : 80;
+            if (_webViewReady && WebView.Visibility == Visibility.Visible)
+                WebView.CoreWebView2.ExecuteScriptAsync("document.querySelectorAll('video,audio').forEach(m => m.muted=false)");
         }
     }
 

From 59ab798b7456666bb69e74f336d1ff51db9a4b36 Mon Sep 17 00:00:00 2001
From: dimedtec <info@dimedtec.de>
Date: Thu, 11 Jun 2026 09:26:38 +0200
Subject: [PATCH 28/28] Always on Top: Pin-Button + Strg+T, blau wenn aktiv

---
 MainWindow.xaml    |  3 +++
 MainWindow.xaml.cs | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/MainWindow.xaml b/MainWindow.xaml
index 11eb2cf..4e35784 100644
--- a/MainWindow.xaml
+++ b/MainWindow.xaml
@@ -381,6 +381,9 @@
                             <Slider x:Name="SldVolume" Width="100" Minimum="0" Maximum="100" Value="80"
                                     VerticalAlignment="Center" Margin="8,0"
                                     ValueChanged="SldVolume_ValueChanged"/>
+                            <Button x:Name="BtnAlwaysOnTop" Content="📌" FontSize="14" Width="40" Height="40"
+                                    Background="Transparent" Foreground="#888" BorderThickness="0"
+                                    Click="BtnAlwaysOnTop_Click" Cursor="Hand" ToolTip="Immer im Vordergrund (Strg+T)"/>
                             <Button x:Name="BtnFullscreen" Content="⛶" FontSize="16" Width="40" Height="40"
                                     Background="Transparent" Foreground="White" BorderThickness="0"
                                     Click="BtnFullscreen_Click" Cursor="Hand" ToolTip="Vollbild (F11)"/>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index dd3792e..8caef16 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -693,6 +693,17 @@ public partial class MainWindow : Window
 
     private void BtnFullscreen_Click(object sender, RoutedEventArgs e) => ToggleFullscreen();
 
+    private void BtnAlwaysOnTop_Click(object sender, RoutedEventArgs e)
+    {
+        Topmost = !Topmost;
+        BtnAlwaysOnTop.Foreground = Topmost
+            ? new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0x00, 0x78, 0xD4))
+            : new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(0x88, 0x88, 0x88));
+        BtnAlwaysOnTop.ToolTip = Topmost
+            ? "Immer im Vordergrund: AN (Strg+T)"
+            : "Immer im Vordergrund (Strg+T)";
+    }
+
     private void ToggleFullscreen()
     {
         if (!_isFullscreen)
@@ -1234,6 +1245,8 @@ public partial class MainWindow : Window
         switch (e.Key)
         {
             case Key.F11: ToggleFullscreen(); e.Handled = true; break;
+            case Key.T when Keyboard.Modifiers == ModifierKeys.Control:
+                BtnAlwaysOnTop_Click(this, new RoutedEventArgs()); e.Handled = true; break;
             case Key.Escape:
                 if (EpgOverlay.Visibility == Visibility.Visible)
                 {