Changeset f2cb80a in mainline for uspace/app/display-cfg/main.c

Timestamp:

2024-02-23T17:57:23Z (15 months ago)

Author:

GitHub <noreply@…>

Children:

192019f

Parents:

86f862c (diff), 90ba06c (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:

boba-buba <120932204+boba-buba@…> (2024-02-23 17:57:23)

git-committer:

GitHub <noreply@…> (2024-02-23 17:57:23)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• uspace/app/display-cfg/main.c (modified) (1 diff)

uspace/app/display-cfg/main.c

@@ -78 +78 @@
 
         rc = display_cfg_open(dcfg, DISPCFG_DEFAULT);
-        if (rc != EOK)
+        if (rc != EOK) {
+                display_cfg_destroy(dcfg);
+                printf("Error opening display configuration service '%s'.\n",
+                    DISPCFG_DEFAULT);
                 return 1;
+        }
 
         rc = display_cfg_populate(dcfg);
-        if (rc != EOK)
+        if (rc != EOK) {
+                display_cfg_destroy(dcfg);
+                printf("Error reading display configuration.\n");
                 return 1;
+        }
 
         ui_run(dcfg->ui);