Changeset 8a9a41e in mainline for uspace/lib/ui/src/msgdialog.c

Timestamp:

2021-10-24T08:28:43Z (4 years ago)

Author:

GitHub <noreply@…>

Children:

9ea3a41

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/lib/ui/src/msgdialog.c (modified) (3 diffs)

uspace/lib/ui/src/msgdialog.c

@@ -103 +103 @@
                 wparams.rect.p0.x = 0;
                 wparams.rect.p0.y = 0;
-                wparams.rect.p1.x = 20;
+                wparams.rect.p1.x = 40;
                 wparams.rect.p1.y = 7;
         } else {
@@ -177 +177 @@
                 goto error;
 
+        dialog->bok = bok;
         bok = NULL;
 
@@ -187 +188 @@
 
         dialog->window = window;
-        dialog->bok = bok;
         *rdialog = dialog;
         return EOK;
 error:
+        if (bok != NULL)
+                ui_pbutton_destroy(bok);
         if (label != NULL)
                 ui_label_destroy(label);