Merge branch 'clean' into main

LouDnl · Oct 5, 2024 · 1f83726 · 1f83726
2 parents 0533af7 + 8be24f5
commit 1f83726
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/vice/src/arch/gtk3/uimedia.c b/vice/src/arch/gtk3/uimedia.c
@@ -708,6 +708,11 @@ static void on_save_video_filename(GtkDialog *dialog,
         }
         g_free(filename);
         g_free(filename_locale);
+
+        /* if for some reason recording is not active now, signal the UI it has been stopped */
+        if (!screenshot_is_recording()) {
+            ui_media_stop_recording();
+        }
     }
     mainlock_release();
     gtk_widget_destroy(GTK_WIDGET(dialog));

diff --git a/vice/src/arch/gtk3/widgets/statusbarrecordingwidget.c b/vice/src/arch/gtk3/widgets/statusbarrecordingwidget.c
@@ -268,7 +268,7 @@ void statusbar_recording_widget_set_recording_status(GtkWidget *widget,
          *        So this needs some serious refactoring.
          */
         type = RW_TYPE_AUDIO;
-    } else {
+    } else if (screenshot_is_recording()) {
         type = RW_TYPE_VIDEO;
     }
 

diff --git a/vice/src/gfxoutputdrv/ffmpegexedrv.c b/vice/src/gfxoutputdrv/ffmpegexedrv.c
@@ -1209,7 +1209,11 @@ static int ffmpegexedrv_save(screenshot_t *screenshot, const char *filename)
     if (test_ffmpeg_executable() < 0) {
         screenshot_stop_recording();
         ui_error("ffmpeg executable could not be started.");
-        return -1;
+        /* Do not return -1, since that would just pop up a second error message,
+           which will eventually appear behind the main window, and make the UI
+           seem to hang. We can do this, since there is no further error handling
+           depending on the return value. */
+        return 0;
     }
 
 #ifdef HAVE_FFMPEG