rebase master

commaai · Jan 14, 2025 · bfaf503 · bfaf503
1 parent e15cc6d
commit bfaf503
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/system/ui/raylib/wifi_manager/main.cc b/system/ui/raylib/wifi_manager/main.cc
@@ -3,7 +3,7 @@
 #include "third_party/raylib/include/raygui.h"
 
 int main() {
-  initApp("Wi-Fi Manager", 30);
+  App app("Wi-Fi Manager", 30);
 
   WifiManager wifi_manager;
   while (!WindowShouldClose()) {
@@ -13,7 +13,5 @@ int main() {
       wifi_manager.draw({40, 100, GetScreenWidth() - 80.0f, GetScreenHeight() - 180.0f});
     EndDrawing();
   }
-
-  CloseWindow();
   return 0;
 }
diff --git a/system/ui/raylib/wifi_manager/wifi_manager.cc b/system/ui/raylib/wifi_manager/wifi_manager.cc
@@ -8,7 +8,7 @@
 #include "third_party/raylib/include/raygui.h"
 
 WifiManager::WifiManager() {
-  GuiSetFont(getFont());
+  GuiSetFont(pApp->getFont());
   GuiSetStyle(DEFAULT, TEXT_SIZE, 40);
   GuiSetStyle(DEFAULT, BACKGROUND_COLOR, ColorToInt({30, 30, 30, 255}));
   GuiSetStyle(DEFAULT, BASE_COLOR_NORMAL, ColorToInt({50, 50, 50, 255}));