Changeset 1c6c3e1d in mainline for uspace/app/taskbar/clock.c

Timestamp:

2023-10-22T17:55:33Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (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 'master' into ticket

File:

• uspace/app/taskbar/clock.c (modified) (2 diffs)

uspace/app/taskbar/clock.c

@@ -322 +322 @@
 {
         taskbar_clock_t *clock = (taskbar_clock_t *) arg;
+        ui_t *ui;
+
+        ui = ui_window_get_ui(clock->window);
+        ui_lock(ui);
 
         fibril_mutex_lock(&clock->lock);
-        (void) taskbar_clock_paint(clock);
+        if (!ui_is_suspended(ui_window_get_ui(clock->window)))
+                (void) taskbar_clock_paint(clock);
 
         if (!clock->timer_cleanup) {
@@ -336 +341 @@
 
         fibril_mutex_unlock(&clock->lock);
+        ui_unlock(ui);
 }