Some null checking

elementary · Jun 21, 2024 · bd1900b · bd1900b
1 parent 9289e0d
commit bd1900b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/Widgets/ActionStack.vala b/src/Widgets/ActionStack.vala
@@ -4,8 +4,8 @@
  */
 
 public class AppCenter.ActionStack : Gtk.Box {
-    private AppCenterCore.Package _package;
-    public AppCenterCore.Package package {
+    private AppCenterCore.Package? _package;
+    public AppCenterCore.Package? package {
         get {
             return _package;
         }
@@ -170,20 +170,20 @@ public class AppCenter.ActionStack : Gtk.Box {
         }
     }
 
-    private void action_cancelled () {
+    private void action_cancelled () requires (package != null) {
         update_action ();
         package.action_cancellable.cancel ();
     }
 
-    private void launch_package_app () {
+    private void launch_package_app () requires (package != null) {
         try {
             package.launch ();
         } catch (Error e) {
             warning ("Failed to launch %s: %s".printf (package.get_name (), e.message));
         }
     }
 
-    private async void action_clicked () {
+    private async void action_clicked () requires (package != null) {
         if (package.installed && !package.update_available) {
             action_button_revealer.reveal_child = false;
         } else if (package.update_available) {

diff --git a/src/Widgets/HumbleButton.vala b/src/Widgets/HumbleButton.vala
@@ -20,7 +20,7 @@
 public class AppCenter.Widgets.HumbleButton : Gtk.Button {
     public signal void download_requested ();
 
-    public AppCenterCore.Package package { get; set; }
+    public AppCenterCore.Package? package { get; set; }
 
     private int _amount = 1;
     public int amount {
@@ -79,6 +79,11 @@ public class AppCenter.Widgets.HumbleButton : Gtk.Button {
 #endif
 
         clicked.connect (() => {
+            if (package == null) {
+                warning ("Humble button with no associated package clicked.");
+                return;
+            }
+
             if (amount != 0) {
                 show_stripe_dialog ();
             } else {