summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-07-14 09:03:25 +0200
committerGitHub <noreply@github.com>2020-07-14 09:03:25 +0200
commit28e8347d6cb1e5e8945ba62b9678849046038bb6 (patch)
tree8e04d15eac7b6d4cba1b55e57452399a31a584de /main
parent41802d83975a52a4f6c23de0bceaa0e055031ee1 (diff)
parent996910b62706774792bde4934e23ef5bde37fc32 (diff)
Merge pull request #40354 from bruvzg/add_vulkan_init_message
Display error popup instead of crashing if Vulkan init failed.
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp2
1 files changed, 1 insertions, 1 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;
}