Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #102220 from jkirsteins/janiskirsteins/fix-joypad-ios

Browse source 
Fix a crash on iOS from Joypad initialization
This commit is contained in:
Thaddeus Crews 2025-01-31 09:15:39 -06:00
commit c5d064ed1b
No known key found for this signature in database
GPG key ID: 62181B86FE9E5D84
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
platform/ios/os_ios.h
View file

@ -65,8 +65,7 @@ private:
virtual void initialize_core() override;
virtual void initialize() override;
virtual void initialize_joypads() override {
}
virtual void initialize_joypads() override;
virtual void set_main_loop(MainLoop *p_main_loop) override;
virtual MainLoop *get_main_loop() const override;

6
platform/ios/os_ios.mm
View file

@ -126,11 +126,13 @@ void OS_IOS::initialize() {
initialize_core();
}
void OS_IOS::initialize_joypads() {
joypad_apple = memnew(JoypadApple);
}
void OS_IOS::initialize_modules() {
ios = memnew(iOS);
Engine::get_singleton()->add_singleton(Engine::Singleton("iOS", ios));
joypad_apple = memnew(JoypadApple);
}
void OS_IOS::deinitialize_modules() {