Changeset 29e7cc7 in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2025-04-18T15:14:10Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (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.

Message:

Merge branch 'upstream/master' into helenraid

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (3 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2025 Jiri Svoboda
  * All rights reserved.
  *
@@ -1355 +1355 @@
         }
 
-        if (i >= argc || str_cmp(argv[i], "display") == 0) {
-                rc = demo_display(display_svc);
+        if (i >= argc || str_cmp(argv[i], "ui") == 0) {
+                rc = demo_ui(ui_display_spec);
                 if (rc != EOK)
                         return 1;
@@ -1363 +1363 @@
                 if (rc != EOK)
                         return 1;
-        } else if (str_cmp(argv[i], "ui") == 0) {
-                rc = demo_ui(ui_display_spec);
+        } else if (str_cmp(argv[i], "display") == 0) {
+                rc = demo_display(display_svc);
                 if (rc != EOK)
                         return 1;