Remove build directory in install script

3 files changed, 6 insertions, 7 deletions

diff --git a/TODO b/TODO
index f6da035..bf052eb 100644
--- a/TODO
+++ b/TODO
@@ -33,6 +33,4 @@ Have separate options for each record option (stream, record and replay) or have
 
 Add refresh button for audio devices. Put it beside the "add" button. In the new ui this should update automatically without a button.
 
-Add support for desktop portal capture. Test first ScreenCast "version" property to see if the desktop portal is running at all with support for ScreenCast. Make it grayed out if not.
-
 Gray out monitor capture on intel if plane is compressed. Show the user to desktop portal capture instead.
diff --git a/install.sh b/install.sh
index 78e45b8..0396ea8 100755
--- a/install.sh
+++ b/install.sh
@@ -7,7 +7,8 @@ cd "$script_dir"
 
 echo "Warning: this install.sh script is deprecated. Use meson directly instead if possible"
 
-test -d build || meson setup build
+rm -rf build
+meson setup build
 meson configure --prefix=/usr --buildtype=release -Dstrip=true build
 ninja -C build install
 
diff --git a/src/main.cpp b/src/main.cpp
index a2e8c1a..08dec68 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2533,17 +2533,17 @@ static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *a
         gtk_list_store_set(store, &iter, 1, "focused", -1);
     } else {
         gtk_list_store_append(store, &iter);
-        gtk_list_store_set(store, &iter, 0, "Window", -1, "window", -1);
+        gtk_list_store_set(store, &iter, 0, "Window", -1);
         gtk_list_store_set(store, &iter, 1, "window", -1);
 
         gtk_list_store_append(store, &iter);
-        gtk_list_store_set(store, &iter, 0, "Follow focused window", -1, "focused", -1);
+        gtk_list_store_set(store, &iter, 0, "Follow focused window", -1);
         gtk_list_store_set(store, &iter, 1, "focused", -1);
     }
 
     const bool allow_screen_capture = is_monitor_capture_drm() || nvfbc_installed;
     if(allow_screen_capture) {
-        if(gsr_info.system_info.display_server != DisplayServer::WAYLAND && gsr_info.gpu_info.vendor == GpuVendor::NVIDIA) {
+        if(gsr_info.supported_capture_options.screen) {
             gtk_list_store_append(store, &iter);
             gtk_list_store_set(store, &iter, 0, "All monitors", -1);
             gtk_list_store_set(store, &iter, 1, "screen", -1);
@@ -2582,7 +2582,7 @@ static GtkWidget* create_common_settings_page(GtkStack *stack, GtkApplication *a
     }
 
     gtk_list_store_append(store, &iter);
-    gtk_list_store_set(store, &iter, 0, "Desktop portal", -1);
+    gtk_list_store_set(store, &iter, 0, gsr_info.supported_capture_options.portal ? "Desktop portal (experimental)" : "Desktop portal (not supported on your system)", -1);
     gtk_list_store_set(store, &iter, 1, "portal", -1);
 
     record_area_selection_menu = GTK_COMBO_BOX(gtk_combo_box_new_with_model(record_area_selection_model));