Changeset ebb1489 in mainline for uspace/srv/hid/display/cfgops.c

Timestamp:

2024-10-13T08:23:40Z (8 weeks ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (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-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

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

File:

• uspace/srv/hid/display/cfgops.c (modified) (6 diffs)

uspace/srv/hid/display/cfgops.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -41 +41 @@
 #include "display.h"
 #include "idevcfg.h"
+#include "main.h"
 #include "seat.h"
 #include "cfgclient.h"
@@ -181 +182 @@
 
         (void) ds_display_paint(cfgclient->display, NULL);
+        (void) ds_display_save_cfg(cfgclient->display, cfg_file_path);
         ds_display_unlock(cfgclient->display);
 
@@ -218 +220 @@
 
         (void) ds_display_paint(cfgclient->display, NULL);
-        ds_display_unlock(cfgclient->display);
+        (void) ds_display_save_cfg(cfgclient->display, cfg_file_path);
+        ds_display_unlock(cfgclient->display);
+
         return EOK;
 }
@@ -254 +258 @@
         (void)idevcfg;
 
+        (void) ds_display_save_cfg(cfgclient->display, cfg_file_path);
         ds_display_unlock(cfgclient->display);
         return EOK;
@@ -287 +292 @@
 
         ds_idevcfg_destroy(idevcfg);
+        (void) ds_display_save_cfg(cfgclient->display, cfg_file_path);
         ds_display_unlock(cfgclient->display);
         return EOK;