Move 'merge audio tracks' button to audio area

3 files changed, 11 insertions, 2 deletions

diff --git a/TODO b/TODO
index c475c73..2c3c517 100644
--- a/TODO
+++ b/TODO
@@ -21,3 +21,5 @@ Add option to start replay on system startup (use the gpu screen recorder system
 Remove the need to install gpu screen recorder flatpak as system. This can now be done because of kms-server-proxy.
 Implement profiles to quickly switch between settings.
 Use https://hosted.weblate.org/ for translation.
+
+Detect game name by using x11 window class or title. Fallback to finding pressure vessel, find the binary is runs and get the directory name directly under the proton game list directory. Fallback to pure wine.
diff --git a/com.dec05eba.gpu_screen_recorder.appdata.xml b/com.dec05eba.gpu_screen_recorder.appdata.xml
index d2b0149..0de98eb 100644
--- a/com.dec05eba.gpu_screen_recorder.appdata.xml
+++ b/com.dec05eba.gpu_screen_recorder.appdata.xml
@@ -84,6 +84,13 @@
     </screenshots>
 
     <releases>
+        <release version="3.8.1" date="2024-06-16">
+            <description>
+                <ul>
+                    <li>Properly cutout cursor outside video area when dealing with AMD HEVC padding driver bug</li>
+                </ul>
+            </description>
+        </release>
         <release version="3.8.0" date="2024-06-10">
             <description>
                 <ul>
diff --git a/src/main.cpp b/src/main.cpp
index c76f3b7..5e52f0f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2697,7 +2697,7 @@ static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *a
     merge_audio_tracks_button = gtk_check_button_new_with_label("Merge audio tracks");
     gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(merge_audio_tracks_button), true);
     gtk_widget_set_halign(merge_audio_tracks_button, GTK_ALIGN_START);
-    gtk_grid_attach(grid, merge_audio_tracks_button, 0, grid_row++, 2, 1);
+    gtk_grid_attach(audio_grid, merge_audio_tracks_button, 0, audio_input_area_row++, 2, 1);
 
     GtkGrid *fps_grid = GTK_GRID(gtk_grid_new());
     gtk_grid_attach(grid, GTK_WIDGET(fps_grid), 0, grid_row++, 2, 1);
@@ -3650,7 +3650,7 @@ static void activate(GtkApplication *app, gpointer) {
     if(!gl_get_gpu_info(&egl, &gpu_inf)) {
         GtkWidget *dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK,
             "Failed to get OpenGL information. Make sure your GPU drivers are properly installed. "
-            "If you are using nvidia then make sure to run \"flatpak update\" to keep all of your flatpaks up to date. You might also need to install a flatpak nvidia driver version that matches your distros nvidia driver version.");
+            "If you are using nvidia then make sure to run \"flatpak update\" to make sure that your flatpak nvidia driver version matches your distros nvidia driver version. If this doesn't work then you might need to manually install a flatpak nvidia driver version that matches your distros nvidia driver version.");
         gtk_dialog_run(GTK_DIALOG(dialog));
         gtk_widget_destroy(dialog);
         g_application_quit(G_APPLICATION(app));