Merge tag 'upstream/0.24.1'

Upstream version 0.24.1

1 files changed, 6 insertions, 2 deletions

diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index c3a1bd0..63623ea 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1309,7 +1309,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
             !(
                 create_new_radio.get_active() &&
                 (
-                    category_name != "" ||
+                    category_name == "" ||
                     category_already_exists(search_name)
                 )
             )
@@ -1342,8 +1342,12 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, Object {
         bool isfirst = true;
         if (publishables != null) {
             foreach (Spit.Publishing.Publishable pub in publishables) {
-                string cur = pub.get_param_string(
+                string? cur = pub.get_param_string(
                     Spit.Publishing.Publishable.PARAM_STRING_EVENTCOMMENT);
+                if (cur == null) {
+                    continue;
+                }
+
                 if (isfirst) {
                     common = cur;
                     isfirst = false;