Changeset 983052c in mainline for uspace/app/taskbar/clock.c

Timestamp:

2023-10-10T12:30:54Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bd2fab5

Parents:

9bec33a

git-author:

Jiri Svoboda <jiri@…> (2023-10-09 18:30:06)

git-committer:

Jiri Svoboda <jiri@…> (2023-10-10 12:30:54)

Message:

Task bar should not crash when starting in terminal

Firstly, we need to make sure we do not paint anything while
UI is suspended. Also, we were missing calls to ui_lock/unlock()
while delivering kbd/pos events from console.

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);
 }