Просмотр исходного кода

Merge pull request #12 from kbembedded/fix-furi-crash

Fix furi crash
Esteban Fuentealba 2 лет назад
Родитель
Сommit
62a7b2a911
2 измененных файлов с 3 добавлено и 5 удалено
  1. 1 4
      pokemon_app.cpp
  2. 2 1
      views/trade.cpp

+ 1 - 4
pokemon_app.cpp

@@ -124,10 +124,7 @@ extern "C" int32_t pokemon_app(void* p) {
     furi_hal_light_set(LightRed, 0x00);
     furi_hal_light_set(LightGreen, 0x00);
     furi_hal_light_set(LightBlue, 0x00);
-    view_dispatcher_enable_queue(app->view_dispatcher);
-    view_dispatcher_attach_to_gui(app->view_dispatcher, app->gui, ViewDispatcherTypeFullscreen);
     //switch view  and run dispatcher
-    view_dispatcher_switch_to_view(app->view_dispatcher, AppViewSelectPokemon);
     view_dispatcher_run(app->view_dispatcher);
 
     // Free resources
@@ -135,4 +132,4 @@ extern "C" int32_t pokemon_app(void* p) {
     furi_record_close(RECORD_GUI);
 
     return 0;
-}
+}

+ 2 - 1
views/trade.cpp

@@ -327,6 +327,7 @@ void trade_enter_callback(void* context) {
         GpioModeInterruptRise,
         GpioPullNo,
         GpioSpeedVeryHigh); // <-- This line causes the "OK" to stop functioning when exiting the application, so a reboot of the Flipper Zero is required.
+    furi_hal_gpio_remove_int_callback(&GAME_BOY_CLK);
     furi_hal_gpio_add_int_callback(&GAME_BOY_CLK, input_clk_gameboy, trade);
 
     // furi_hal_gpio_disable_int_callback(&GAME_BOY_CLK);
@@ -384,4 +385,4 @@ void trade_free(App* app) {
 View* trade_get_view(App* app) {
     furi_assert(app);
     return app->trade->view;
-}
+}