Changeset 1aa8c86 in mainline

Timestamp:

2021-11-03T21:05:07Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f05f413

Parents:

552b69f

git-author:

Jiri Svoboda <jiri@…> (2021-11-03 21:04:31)

git-committer:

Jiri Svoboda <jiri@…> (2021-11-03 21:05:07)

Message:

Fix navigator crashing if it cannot initialize output

File:

• uspace/app/nav/nav.c (modified) (1 diff)

uspace/app/nav/nav.c

@@ -230 +230 @@
 
         for (i = 0; i < 2; i++) {
-                ui_fixed_remove(navigator->fixed,
-                    panel_ctl(navigator->panel[i]));
-                panel_destroy(navigator->panel[i]);
-        }
-
-        ui_fixed_remove(navigator->fixed, nav_menu_ctl(navigator->menu));
-
-        if (navigator->menu != NULL)
+                if (navigator->panel[i] != NULL) {
+                        ui_fixed_remove(navigator->fixed,
+                            panel_ctl(navigator->panel[i]));
+                        panel_destroy(navigator->panel[i]);
+                }
+        }
+
+
+        if (navigator->menu != NULL) {
+                ui_fixed_remove(navigator->fixed, nav_menu_ctl(navigator->menu));
                 nav_menu_destroy(navigator->menu);
+        }
+
         if (navigator->window != NULL)
                 ui_window_destroy(navigator->window);