commit 4264ee890e35f3ca06824f65bf93db7ef7c73b37
author Tao Bao <tbao@google.com> Thu Jun 14 04:03:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 14 04:03:24 2018 +0000
tree 9fda3217fa50afecfe232fcc1ef80a4349321cc3
parent 4cd2cf96a071c10958fd5e5f6b0b2c6279b328b4
parent ba4edb3e82d383a274cea979c9cacfd2e7f62568

Merge "screen_ui: Move the call to gr_init() into Init()."

screen_ui.cpp

diff --git a/screen_ui.cpp b/screen_ui.cpp
index e8444b6..f9c4a06 100644
--- a/screen_ui.cpp
+++ b/screen_ui.cpp
@@ -702,10 +702,10 @@
 }
 
 bool ScreenRecoveryUI::InitTextParams() {
-  if (gr_init() < 0) {
+  // gr_init() would return successfully on font initialization failure.
+  if (gr_sys_font() == nullptr) {
     return false;
   }
-
   gr_font_size(gr_sys_font(), &char_width_, &char_height_);
   text_rows_ = (ScreenHeight() - kMarginHeight * 2) / char_height_;
   text_cols_ = (ScreenWidth() - kMarginWidth * 2) / char_width_;
@@ -715,6 +715,10 @@
 bool ScreenRecoveryUI::Init(const std::string& locale) {
   RecoveryUI::Init(locale);
 
+  if (gr_init() == -1) {
+    return false;
+  }
+
   if (!InitTextParams()) {
     return false;
   }