diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 2 | ||||
| -rw-r--r-- | main/tests/test_astar.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/main/main.cpp b/main/main.cpp index 4fbbc21f41..bb4751c61d 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -1298,7 +1298,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { } } - if (!display_server) { + if (!display_server || err != OK) { ERR_PRINT("Unable to create DisplayServer, all display drivers failed."); return err; } diff --git a/main/tests/test_astar.cpp b/main/tests/test_astar.cpp index fe335589b0..cb5fcfe37b 100644 --- a/main/tests/test_astar.cpp +++ b/main/tests/test_astar.cpp @@ -102,9 +102,9 @@ bool test_add_remove() { a.connect_points(1, 3, true); a.connect_points(1, 4, false); - ok = ok && (a.are_points_connected(2, 1) == true); - ok = ok && (a.are_points_connected(4, 1) == true); - ok = ok && (a.are_points_connected(2, 1, false) == true); + ok = ok && (a.are_points_connected(2, 1)); + ok = ok && (a.are_points_connected(4, 1)); + ok = ok && (a.are_points_connected(2, 1, false)); ok = ok && (a.are_points_connected(4, 1, false) == false); a.disconnect_points(1, 2, true); @@ -179,7 +179,7 @@ bool test_add_remove() { if (Math::rand() % 2 == 1) { // Add a (possibly existing) directed edge and confirm connectivity a.connect_points(u, v, false); - ok = ok && (a.are_points_connected(u, v, false) == true); + ok = ok && (a.are_points_connected(u, v, false)); } else { // Remove a (possibly nonexistent) directed edge and confirm disconnectivity a.disconnect_points(u, v, false); |